From 1395e4303a056f7b53d6b6ed5d47350bf8e7dea4 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Mon, 13 Oct 2014 13:04:04 +0200 Subject: [PATCH 1/2] Fix static CRT selection. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8a78c5..6ed3a4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,7 @@ if (MSVC) # Turn off Microsofts "security" warnings. add_definitions( "/W3 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /nologo" ) - if (STATIC_CRT) + if (JANSSON_STATIC_CRT) set(CMAKE_C_FLAGS_RELEASE "/MT") set(CMAKE_C_FLAGS_DEBUG "/MTd") endif() From b52e7a69aac457e258782bce0d0a3894d9acb686 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Mon, 13 Oct 2014 13:06:02 +0200 Subject: [PATCH 2/2] Fix CFLAGS for static-CRT build. Setting the variables to only "/MT(d)" resets all other flags to their defaults, so the debug build used release flags. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ed3a4c..fdc6b36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,8 +98,8 @@ if (MSVC) add_definitions( "/W3 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /nologo" ) if (JANSSON_STATIC_CRT) - set(CMAKE_C_FLAGS_RELEASE "/MT") - set(CMAKE_C_FLAGS_DEBUG "/MTd") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd") endif() endif()