[Cmake-commits] CMake branch, next, updated. v2.8.2-1054-gad39bab

[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  ad39bab508c9b61616a6bf2f58e9ef931402f850 (commit)
       via  b867a3f1a81b2dcb399a3e39ea8b9454d8f0508f (commit)
      from  94040d6299c4afc8bc5244ee8905f41731459bfe (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=ad39bab508c9b61616a6bf2f58e9ef931402f850
commit ad39bab508c9b61616a6bf2f58e9ef931402f850
Merge: 94040d6 b867a3f
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Mon Oct 11 22:56:59 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 11 22:56:59 2010 -0400

    Merge topic 'FindBoost_bugfix_cleanup' into next
    
    b867a3f Remove superfluous variable Boost_COMPAT_STATIC_RUNTIME.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b867a3f1a81b2dcb399a3e39ea8b9454d8f0508f
commit b867a3f1a81b2dcb399a3e39ea8b9454d8f0508f
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Mon Oct 11 22:48:33 2010 -0400
Commit:     Philip Lowman <philip at yhbt.com>
CommitDate: Mon Oct 11 22:48:33 2010 -0400

    Remove superfluous variable Boost_COMPAT_STATIC_RUNTIME.
    
    There is no need to introduce this extra variable as FindBoost
    can simply rely on if Boost_USE_STATIC_RUNTIME is defined
    or not to disable the old searching behavior for static runtime
    libraries on WIN32.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 2377e10..3ae4e14 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -20,7 +20,6 @@
 #   set(Boost_USE_STATIC_LIBS        ON)
 #   set(Boost_USE_MULTITHREADED      ON)
 #   set(Boost_USE_STATIC_RUNTIME    OFF)
-#   set(Boost_COMPAT_STATIC_RUNTIME OFF)
 #   find_package( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
 #
 #   if(Boost_FOUND)
@@ -94,7 +93,10 @@
 #
 #   Boost_USE_STATIC_RUNTIME     If enabled, searches for boost libraries
 #                                linked against a static C++ standard library
-#                                ('s' ABI tag). Defaults to OFF.
+#                                ('s' ABI tag). This option should be set to
+#                                ON or OFF because the default behavior
+#                                if not specified is platform dependent
+#                                for backwards compatibility.
 #                                  [Since CMake 2.8.3]
 #
 #   Boost_USE_DEBUG_PYTHON       If enabled, searches for boost libraries
@@ -114,14 +116,6 @@
 #                                Defaults to OFF.
 #                                  [Since CMake 2.8.3]
 #
-#   Boost_COMPAT_STATIC_RUNTIME  Set to OFF to disable backwards compatible
-#                                searching for libraries with the 's' ABI
-#                                tag on WIN32 after normal searches.  You
-#                                should set this to OFF and also set
-#                                Boost_USE_STATIC_RUNTIME appropriately.
-#                                If not specified, defaults to ON.
-#                                  [Since CMake 2.8.3]
-#
 # Other Variables used by this module which you may want to set.
 #
 #   Boost_ADDITIONAL_VERSIONS    A list of version numbers to use for searching
@@ -372,9 +366,6 @@ endfunction()
 IF(NOT DEFINED Boost_USE_MULTITHREADED)
     SET(Boost_USE_MULTITHREADED TRUE)
 ENDIF()
-if(NOT DEFINED Boost_COMPAT_STATIC_RUNTIME)
-  set(Boost_COMPAT_STATIC_RUNTIME TRUE)
-endif()
 
 if(Boost_FIND_VERSION_EXACT)
   # The version may appear in a directory with or without the patch
@@ -868,11 +859,11 @@ ELSE (_boost_IN_CACHE)
   #  1. Search for static libs compiled against a SHARED C++ standard runtime library (use if found)
   #  2. Search for static libs compiled against a STATIC C++ standard runtime library (use if found)
   # We maintain this behavior since changing it could break people's builds.
-  # To disable the ambiguous behavior, the user can
-  # set Boost_COMPAT_STATIC_RUNTIME to FALSE
+  # To disable the ambiguous behavior, the user need only
+  # set Boost_USE_STATIC_RUNTIME either ON or OFF.
   set(_boost_STATIC_RUNTIME_WORKAROUND false)
-  if(Boost_COMPAT_STATIC_RUNTIME AND WIN32 AND Boost_USE_STATIC_LIBS)
-    if(NOT Boost_USE_STATIC_RUNTIME)
+  if(WIN32 AND Boost_USE_STATIC_LIBS)
+    if(NOT DEFINED Boost_USE_STATIC_RUNTIME)
       set(_boost_STATIC_RUNTIME_WORKAROUND true)
     endif()
   endif()

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

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


hooks/post-receive
-- 
CMake