diff options
Diffstat (limited to 'Externals')
| -rw-r--r-- | Externals/CMakeModules/FindGoogleTest.cmake | 13 | ||||
| -rw-r--r-- | Externals/CMakeModules/FindPxShared.cmake | 10 |
2 files changed, 12 insertions, 11 deletions
diff --git a/Externals/CMakeModules/FindGoogleTest.cmake b/Externals/CMakeModules/FindGoogleTest.cmake index 5ac8391..c15e201 100644 --- a/Externals/CMakeModules/FindGoogleTest.cmake +++ b/Externals/CMakeModules/FindGoogleTest.cmake @@ -8,16 +8,19 @@ FIND_PATH( GOOGLETEST_INCLUDE_DIR gtest/gtest.h HINTS ${GW_DEPS_ROOT}/GoogleTest ${GW_DEPS_ROOT}/sw/physx/externals/GoogleTest/gtest-1.4.0 - PATH_SUFFIXES include) + PATH_SUFFIXES include + NO_DEFAULT_PATH + NO_CMAKE_FIND_ROOT_PATH) FIND_PATH( GOOGLETEST_SRC_DIR gtest.cpp HINTS ${GW_DEPS_ROOT}/GoogleTest ${GW_DEPS_ROOT}/sw/physx/externals/GoogleTest/gtest-1.4.0 - PATH_SUFFIXES src) - + PATH_SUFFIXES src + NO_DEFAULT_PATH + NO_CMAKE_FIND_ROOT_PATH) + INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(GoogleTest DEFAULT_MSG GOOGLETEST_INCLUDE_DIR GOOGLETEST_SRC_DIR) -mark_as_advanced(GOOGLETEST_INCLUDE_DIR GOOGLETEST_SRC_DIR)
\ No newline at end of file +mark_as_advanced(GOOGLETEST_INCLUDE_DIR GOOGLETEST_SRC_DIR) diff --git a/Externals/CMakeModules/FindPxShared.cmake b/Externals/CMakeModules/FindPxShared.cmake index afee4d7..3297996 100644 --- a/Externals/CMakeModules/FindPxShared.cmake +++ b/Externals/CMakeModules/FindPxShared.cmake @@ -4,15 +4,13 @@ # PXSHARED_ROOT_DIR - The root of PxShared # NOTE: We're including a version in this, but the first hint is without one - we should use that! -FIND_PATH( PXSHARED_ROOT_DIR include/cudamanager/PxGpuCopyDesc.h +FIND_PATH( PXSHARED_ROOT_DIR include/foundation/Px.h HINTS ${GW_DEPS_ROOT}/PxShared ${GW_DEPS_ROOT}/sw/physx/PxShared/1.0/trunk - ) - - - - + NO_DEFAULT_PATH + NO_CMAKE_FIND_ROOT_PATH) + INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PxShared DEFAULT_MSG PXSHARED_ROOT_DIR) |