[Cmake-commits] CMake branch, next, updated. v2.8.3-665-gb96b602
Philip Lowman
philip at yhbt.com
Thu Nov 18 22:30:56 EST 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via b96b602d0e0e9d828518db78cbc8859b8ef5258b (commit)
via a44a05cd9de17f3dec7dbcae405e4f455176bd3a (commit)
from da31556209e4914df47cc7fbd6058ca6c3c35eaa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b96b602d0e0e9d828518db78cbc8859b8ef5258b
commit b96b602d0e0e9d828518db78cbc8859b8ef5258b
Merge: da31556 a44a05c
Author: Philip Lowman <philip at yhbt.com>
AuthorDate: Thu Nov 18 22:30:46 2010 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 18 22:30:46 2010 -0500
Merge topic '11430' into next
a44a05c 11430: FindBullet doesn't find header files installed by Bullet >= 2.77
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a44a05cd9de17f3dec7dbcae405e4f455176bd3a
commit a44a05cd9de17f3dec7dbcae405e4f455176bd3a
Author: Philip Lowman <philip at yhbt.com>
AuthorDate: Thu Nov 18 22:24:21 2010 -0500
Commit: Philip Lowman <philip at yhbt.com>
CommitDate: Thu Nov 18 22:24:21 2010 -0500
11430: FindBullet doesn't find header files installed by Bullet >= 2.77
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
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBullet.cmake | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list