[Cmake-commits] CMake branch, next, updated. v2.8.8-3214-gae6d242

Brad King brad.king at kitware.com
Mon Jun 18 08:37:52 EDT 2012


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  ae6d242ce937c5b8e1f648a3c9f20706d9f4d04f (commit)
       via  4393b3bb43310feeb5d50f6abf12bf19cf708f4d (commit)
      from  7a8d9c6e9defeb47c277ddeae7043a562cebd868 (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=ae6d242ce937c5b8e1f648a3c9f20706d9f4d04f
commit ae6d242ce937c5b8e1f648a3c9f20706d9f4d04f
Merge: 7a8d9c6 4393b3b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 18 08:37:50 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 18 08:37:50 2012 -0400

    Merge topic 'FindBullet-LinearMath_Debug' into next
    
    4393b3b FindBullet: Add missing math library name (#13309)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4393b3bb43310feeb5d50f6abf12bf19cf708f4d
commit 4393b3bb43310feeb5d50f6abf12bf19cf708f4d
Author:     Jonathan Klein <Jonathan_Klein at web.de>
AuthorDate: Sat Jun 16 10:34:00 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 18 08:29:41 2012 -0400

    FindBullet: Add missing math library name (#13309)
    
    Add "LinearMath_Debug" to the list of names to search for
    BULLET_MATH_LIBRARY_DEBUG.  The _Debug name is present in all other
    lines already.  Now the script manages to find all debug&release
    libraries on my system.

diff --git a/Modules/FindBullet.cmake b/Modules/FindBullet.cmake
index aea9158..c96755f 100644
--- a/Modules/FindBullet.cmake
+++ b/Modules/FindBullet.cmake
@@ -63,7 +63,7 @@ _FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY_DEBUG  BulletDynamics_Debug BulletD
 _FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY       BulletCollision)
 _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_MATH_LIBRARY_DEBUG      BulletMath_Debug BulletMath_d LinearMath_Debug LinearMath_d)
 _FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY        BulletSoftBody)
 _FIND_BULLET_LIBRARY(BULLET_SOFTBODY_LIBRARY_DEBUG  BulletSoftBody_Debug BulletSoftBody_d)
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindBullet.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list