[Cmake-commits] CMake branch, next, updated. v2.8.10.1-1032-gcc31ece

[Brad King]

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  cc31ecea30615c2bea3a244a7bdb878a87a9b17d (commit)
       via  f180b24ef43d48fcec265656ee73ab9130fe39bd (commit)
      from  0fdd1ec3d6d5eaf0be8e026d048b67d8249fe028 (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=cc31ecea30615c2bea3a244a7bdb878a87a9b17d
commit cc31ecea30615c2bea3a244a7bdb878a87a9b17d
Merge: 0fdd1ec f180b24
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 26 09:17:31 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 26 09:17:31 2012 -0500

    Merge topic 'FindBullet-windows-configs' into next
    
    f180b24 FindBullet: Search in per-config dirs on Windows (#13738)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f180b24ef43d48fcec265656ee73ab9130fe39bd
commit f180b24ef43d48fcec265656ee73ab9130fe39bd
Author:     Alan Witkowski <alan.witkowski at gmail.com>
AuthorDate: Mon Nov 26 09:08:14 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 26 09:08:14 2012 -0500

    FindBullet: Search in per-config dirs on Windows (#13738)
    
    Bullet for windows installs in these per-config paths.

diff --git a/Modules/FindBullet.cmake b/Modules/FindBullet.cmake
index 1c4a9de..1a27fc3 100644
--- a/Modules/FindBullet.cmake
+++ b/Modules/FindBullet.cmake
@@ -33,6 +33,8 @@ macro(_FIND_BULLET_LIBRARY _var)
         ${ARGN}
      HINTS
         ${BULLET_ROOT}
+        ${BULLET_ROOT}/lib/Release
+        ${BULLET_ROOT}/lib/Debug
         ${BULLET_ROOT}/out/release8/libs
         ${BULLET_ROOT}/out/debug8/libs
      PATH_SUFFIXES lib

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

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


hooks/post-receive
-- 
CMake