From 0d5867b95cc6d4c097849ec57eb7ec6223c129de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Wed, 29 Aug 2012 16:20:46 -0400 Subject: [PATCH] cmake: make MSVC static build optional --- CMakeLists.txt | 2 +- cmake/ConfigOptions.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f20ac88b2..803930225 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,7 @@ endif() # This forces the MSVC runtime to be statically linked -if(MSVC) +if(WITH_MSVC_STATIC) foreach(flag_var CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_RELWITHDEBINFO) string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") string(REGEX REPLACE "/MDd" "/MTd" ${flag_var} "${${flag_var}}") diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake index cc2afd95d..a0c8ad15e 100644 --- a/cmake/ConfigOptions.cmake +++ b/cmake/ConfigOptions.cmake @@ -12,6 +12,7 @@ endif() if(MSVC) option(WITH_NATIVE_SSPI "Use native SSPI modules" ON) + option(WITH_MSVC_STATIC "Use static MSVC runtime" OFF) endif() if(${CMAKE_VERSION} VERSION_GREATER 2.8.8)