update CMakeList to provide a customization option concerning the MSV…

…C runtime library configuration (issue cpp-redis#47)
BoBoer · Feb 16, 2017 · c11a9b9 · c11a9b9
1 parent 2e4c20f
commit c11a9b9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,8 +48,20 @@ IF (WIN32)
 
   # was causing conflics with gtest build
   string(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
+
+  IF ("${MSVC_RUNTIME_LIBRARY_CONFIG}" STREQUAL "")
+    set(MSVC_RUNTIME_LIBRARY_CONFIG "/MT")
+  ENDIF() 
+
   foreach (flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE)
-    string(REPLACE "/MD" "-MT" ${flag_var} "${${flag_var}}")
+    IF ("${MSVC_RUNTIME_LIBRARY_CONFIG}" STREQUAL "/MT")
+      string(REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+    ELSEIF ("${MSVC_RUNTIME_LIBRARY_CONFIG}" STREQUAL "/MD")
+      string(REPLACE "/MT" "/MD" ${flag_var} "${${flag_var}}")
+    ELSE ()
+      string(REPLACE "/MD" "${MSVC_RUNTIME_LIBRARY_CONFIG}" ${flag_var} "${${flag_var}}")
+      string(REPLACE "/MT" "${MSVC_RUNTIME_LIBRARY_CONFIG}" ${flag_var} "${${flag_var}}")
+    ENDIF()
   endforeach()
 
   add_definitions(-D_UNICODE)

diff --git a/tacopie b/tacopie
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -34,6 +34,7 @@ IF (NOT WIN32)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 ENDIF (NOT WIN32)
 
+
 ###
 # includes
 ###
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,7 @@ IF (NOT WIN32) @@
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     ENDIF (NOT WIN32)
     ###
     # includes
     ###
@@ Expand Down @@