diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-09 18:54:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-09 18:54:21 (GMT) |
| commit | 089ae7122b3ba030ca55b5a85be54b334c16f4b2 (patch) | |
| tree | 6a1276fdb75ca085d71862cec3b9a2f2da581dab /Modules | |
| parent | a0eb52c10c759f4492642d912a8fc70c802ad6a0 (diff) | |
| parent | d729899a26ba0086e03708ee7316e23d70a4fb2c (diff) | |
| download | CMake-089ae7122b3ba030ca55b5a85be54b334c16f4b2.zip CMake-089ae7122b3ba030ca55b5a85be54b334c16f4b2.tar.gz CMake-089ae7122b3ba030ca55b5a85be54b334c16f4b2.tar.bz2 | |
Merge topic 'FindBoost-ms-debug-runtime'
d729899 FindBoost: Add Boost_USE_DEBUG_RUNTIME option (#14686)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindBoost.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
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") |