diff options
| author | David Cole <david.cole@kitware.com> | 2010-11-23 21:11:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-11-23 21:11:46 (GMT) |
| commit | c985676a96394fbe1de728ba1bafcf845d511048 (patch) | |
| tree | d72959cc93915cca3744edfc99574a16953e12c7 /Modules | |
| parent | 0a5600af2d8467f83eb2f5559c10e5d7776e2ba8 (diff) | |
| parent | a44a05cd9de17f3dec7dbcae405e4f455176bd3a (diff) | |
| download | CMake-c985676a96394fbe1de728ba1bafcf845d511048.zip CMake-c985676a96394fbe1de728ba1bafcf845d511048.tar.gz CMake-c985676a96394fbe1de728ba1bafcf845d511048.tar.bz2 | |
Merge topic '11430'
a44a05c 11430: FindBullet doesn't find header files installed by Bullet >= 2.77
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindBullet.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/FindBullet.cmake b/Modules/FindBullet.cmake index 50c8527..ea0abb7 100644 --- a/Modules/FindBullet.cmake +++ b/Modules/FindBullet.cmake @@ -31,7 +31,7 @@ macro(_FIND_BULLET_LIBRARY _var) find_library(${_var} NAMES ${ARGN} - PATHS + HINTS ${BULLET_ROOT} ${BULLET_ROOT}/out/release8/libs ${BULLET_ROOT}/out/debug8/libs @@ -50,9 +50,10 @@ macro(_BULLET_APPEND_LIBRARIES _list _release) endmacro() find_path(BULLET_INCLUDE_DIR NAMES btBulletCollisionCommon.h - PATHS + HINTS ${BULLET_ROOT}/include ${BULLET_ROOT}/src + PATH_SUFFIXES bullet ) # Find the libraries |