summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-09-26 15:24:46 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-09-26 15:24:46 (GMT)
commit89bdc3e213b82759c3f916ef746c0bc752ce32d2 (patch)
tree95912774c548c405795fba60490c9d865a44d762 /Modules
parentea1901b6a45b357cec18f6c651c4a5f0a9e89c82 (diff)
parent6f935d7f55af5c96d18d23b72991e87d1e029dda (diff)
downloadCMake-89bdc3e213b82759c3f916ef746c0bc752ce32d2.zip
CMake-89bdc3e213b82759c3f916ef746c0bc752ce32d2.tar.gz
CMake-89bdc3e213b82759c3f916ef746c0bc752ce32d2.tar.bz2
Merge topic 'FindBulletLibRenames'
6f935d7 FindBullet: Also search for _Debug postfixed library names
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindBullet.cmake10
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/FindBullet.cmake b/Modules/FindBullet.cmake
index cebb828..aea9158 100644
--- a/Modules/FindBullet.cmake
+++ b/Modules/FindBullet.cmake
@@ -59,13 +59,13 @@ find_path(BULLET_INCLUDE_DIR NAMES btBulletCollisionCommon.h
# Find the libraries
_FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY BulletDynamics)
-_FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY_DEBUG BulletDynamics_d)
+_FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY_DEBUG BulletDynamics_Debug BulletDynamics_d)
_FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY BulletCollision)
-_FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY_DEBUG BulletCollision_d)
-_FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY LinearMath BulletMath)
-_FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY_DEBUG LinearMath_d BulletMath_d)
+_FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY_DEBUG BulletCollision_Debug BulletCollision_d)
+_FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY BulletMath LinearMath)
+_FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY_DEBUG BulletMath_Debug BulletMath_d LinearMath_d)
_FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY BulletSoftBody)
-_FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY_DEBUG BulletSoftBody_d)
+_FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY_DEBUG BulletSoftBody_Debug BulletSoftBody_d)
# handle the QUIETLY and REQUIRED arguments and set BULLET_FOUND to TRUE if