From: Jose F. <jrf...@us...> - 2011-07-15 15:14:57
|
Module: glean Branch: cmake Commit: 19c302331cea544fc66b16a00d411511991a0c08 URL: no.cgit.repo/commit/?id=19c302331cea544fc66b16a00d411511991a0c08 Author: José Fonseca <jfo...@vm...> Date: Fri Jul 15 16:14:00 2011 +0100 Revert "Use static MSVC runtime." Creates havoc when linking against certain libraries. This reverts commit 81469c15be2a5abc49616fd6e51b74dba2b1fbb7. --- src/CMakeLists.txt | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 814fe30..384f6c3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,17 +38,6 @@ else () add_definitions (-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) add_definitions (-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS) - - # Use static runtime - # http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F - foreach (flag_var - CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO - CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO - ) - if (${flag_var} MATCHES "/MD") - string (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") - endif (${flag_var} MATCHES "/MD") - endforeach (flag_var) endif () if (APPLE) |