[Cmake-commits] CMake branch, next, updated. v2.8.4-1756-g22e5ce1

[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  22e5ce18ab79e47c6553de27ad181d1f73d040d7 (commit)
       via  974374a9cdcba725bd20602704d0094b2c20ff65 (commit)
       via  f26d1cf1540583deaffcd141796304645673d56b (commit)
      from  246f73d5277e8ad9ac03e9d9cc0b44a84ba66836 (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=22e5ce18ab79e47c6553de27ad181d1f73d040d7
commit 22e5ce18ab79e47c6553de27ad181d1f73d040d7
Merge: 246f73d 974374a
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Wed Jun 15 08:05:26 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 15 08:05:26 2011 -0400

    Merge topic 'FindBoost_bugfixes_060911' into next
    
    974374a FindBoost: Also search for 1.46.1
    f26d1cf FindBoost: Fixes #12188


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=974374a9cdcba725bd20602704d0094b2c20ff65
commit 974374a9cdcba725bd20602704d0094b2c20ff65
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Thu Jun 9 23:23:41 2011 -0400
Commit:     Philip Lowman <philip at yhbt.com>
CommitDate: Thu Jun 9 23:23:41 2011 -0400

    FindBoost: Also search for 1.46.1

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 348f658..c3ac424 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -65,7 +65,7 @@
 # 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
 # 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
 # 1.40, 1.40.0, 1.41, 1.41.0, 1.42, 1.42.0, 1.43, 1.43.0, 1.44, 1.44.0,
-# 1.45, 1.45.0, 1.46, 1.46.0
+# 1.45, 1.45.0, 1.46, 1.46.0, 1.46.1
 #
 # NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
 # add both 1.x and 1.x.0 as shown above.  Official Boost include directories
@@ -392,6 +392,7 @@ else(Boost_FIND_VERSION_EXACT)
   # The user has not requested an exact version.  Among known
   # versions, find those that are acceptable to the user request.
   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+    "1.46.1"
     "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42"
     "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
     "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f26d1cf1540583deaffcd141796304645673d56b
commit f26d1cf1540583deaffcd141796304645673d56b
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Thu Jun 9 23:20:18 2011 -0400
Commit:     Philip Lowman <philip at yhbt.com>
CommitDate: Thu Jun 9 23:20:18 2011 -0400

    FindBoost: Fixes #12188
    
    Workaround an issue where users wanted to use Boost_LIBRARIES with the
    install() command and debug/optimized keywords were interfering.  Now
    debug/optimized keywords are removed if the release & debug library
    are the same.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index f17e599..348f658 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -281,6 +281,12 @@ macro(_Boost_ADJUST_LIB_VARS basename)
       set(Boost_${basename}_LIBRARY         ${Boost_${basename}_LIBRARY_DEBUG})
       set(Boost_${basename}_LIBRARIES       ${Boost_${basename}_LIBRARY_DEBUG})
     endif()
+
+    # If the debug & release library ends up being the same, omit the keywords
+    if(${Boost_${basename}_LIBRARY_RELEASE} STREQUAL ${Boost_${basename}_LIBRARY_DEBUG})
+      set(Boost_${basename}_LIBRARY   ${Boost_${basename}_LIBRARY_RELEASE} )
+      set(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_RELEASE} )
+    endif()
     
     if(Boost_${basename}_LIBRARY)
       set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")

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

Summary of changes:
 Modules/FindBoost.cmake |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake