[Cmake-commits] CMake branch, next, updated. v2.8.5-1956-gd66bbbd

[Philip Lowman]

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  d66bbbda7f7ed904a06effdda0a29693167dfe65 (commit)
       via  6f935d7f55af5c96d18d23b72991e87d1e029dda (commit)
      from  83cabdf85c8637c76a6afada5a5656fcc9072db5 (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=d66bbbda7f7ed904a06effdda0a29693167dfe65
commit d66bbbda7f7ed904a06effdda0a29693167dfe65
Merge: 83cabdf 6f935d7
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Thu Sep 22 23:35:30 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 22 23:35:30 2011 -0400

    Merge topic 'FindBulletLibRenames' into next
    
    6f935d7 FindBullet: Also search for _Debug postfixed library names


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f935d7f55af5c96d18d23b72991e87d1e029dda
commit 6f935d7f55af5c96d18d23b72991e87d1e029dda
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Thu Sep 22 23:31:37 2011 -0400
Commit:     Philip Lowman <philip at yhbt.com>
CommitDate: Thu Sep 22 23:31:37 2011 -0400

    FindBullet: Also search for _Debug postfixed library names

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 

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

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


hooks/post-receive
-- 
CMake