[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6864-gdef19cd

[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  def19cdde7584d6b462f8ffc277f4de84da3133a (commit)
       via  d729899a26ba0086e03708ee7316e23d70a4fb2c (commit)
      from  db23a893869d483fae8dd502147b20aeeca826b1 (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=def19cdde7584d6b462f8ffc277f4de84da3133a
commit def19cdde7584d6b462f8ffc277f4de84da3133a
Merge: db23a89 d729899
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 8 11:33:57 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 8 11:33:57 2014 -0500

    Merge topic 'FindBoost-ms-debug-runtime' into next
    
    d729899 FindBoost: Add Boost_USE_DEBUG_RUNTIME option (#14686)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d729899a26ba0086e03708ee7316e23d70a4fb2c
commit d729899a26ba0086e03708ee7316e23d70a4fb2c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 8 11:32:17 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 8 11:32:17 2014 -0500

    FindBoost: Add Boost_USE_DEBUG_RUNTIME option (#14686)
    
    Add an option to control use of the 'g' runtime debug library tag
    on MSVC tools.  Default to ON to preserve existing behavior.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 51a3d77..ae8baab 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -82,6 +82,9 @@
 #   Boost_USE_STATIC_RUNTIME - Set to ON or OFF to specify whether to use
 #                              libraries linked statically to the C++ runtime
 #                              ('s' tag).  Default is platform dependent.
+#   Boost_USE_DEBUG_RUNTIME  - Set to ON or OFF to specify whether to use
+#                              libraries linked to the MS debug C++ runtime
+#                              ('g' tag).  Default is ON.
 #   Boost_USE_DEBUG_PYTHON   - Set to ON to use libraries compiled with a
 #                              debug Python build ('y' tag). Default is OFF.
 #   Boost_USE_STLPORT        - Set to ON to use libraries compiled with
@@ -446,6 +449,9 @@ endfunction()
 if(NOT DEFINED Boost_USE_MULTITHREADED)
     set(Boost_USE_MULTITHREADED TRUE)
 endif()
+if(NOT DEFINED Boost_USE_DEBUG_RUNTIME)
+  set(Boost_USE_DEBUG_RUNTIME TRUE)
+endif()
 
 # Check the version of Boost against the requested version.
 if(Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
@@ -787,7 +793,7 @@ if(Boost_USE_STATIC_RUNTIME)
 endif()
 #  g        using debug versions of the standard and runtime
 #           support libraries
-if(WIN32)
+if(WIN32 AND Boost_USE_DEBUG_RUNTIME)
   if(MSVC OR "${CMAKE_CXX_COMPILER}" MATCHES "icl"
           OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
     set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}g")

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

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


hooks/post-receive
-- 
CMake