Windows change to using runtime library dynamic linking

Author: silvakid

CMakeLists.txt

@@ -89,12 +89,26 @@ IF(CMAKE_ENABLE_C++11)
   ENDIF(COMPILER_SUPPORTS_CXX11)
 ENDIF(CMAKE_ENABLE_C++11)
 
-#-----------------
-# Changing CRT from dynamic to static (Windows Only)
-IF(WIN32)
-  INCLUDE(${CMAKE_SOURCE_DIR}/changeCrt.cmake)
-  CHANGE_CRT("/MT")
-ENDIF(WIN32)
+
+#
+# Configure static runtime library on Windows if requested
+#
+
+option(STATIC_MSVCRT "Use static MSVC runtime library" ON)
+
+if(WIN32 AND STATIC_MSVCRT)
+
+message("Using static runtime library")
+
+foreach(LANG C CXX)
+  set(CMAKE_${LANG}_FLAGS "${CMAKE_${LANG}_FLAGS} /MT")
+  foreach(TYPE RELEASE RELWITHDEBINFO MINSIZEREL)
+    set(CMAKE_${LANG}_FLAGS_${TYPE} "${CMAKE_${LANG}_FLAGS_${TYPE}} /MT")
+  endforeach()
+  set(CMAKE_${LANG}_FLAGS_DEBUG "${CMAKE_${LANG}_FLAGS_DEBUG} /MTd")
+endforeach(LANG)
+
+endif()
 
 #-----------------
 # ICU

changeCrt.cmake

@@ -41,6 +41,8 @@ MACRO(CHANGE_CRT _switch2use)
           STRING(REGEX REPLACE "/M${switch2change}" "/M${switch2use}" ${flags} "${${flags}}")
         ENDIF(${flags} MATCHES "/M${switch2change}")
 
+        MESSAGE(STATUS, "CHANGE_CRT ${flags} ${${flags}}")
+
       ENDFOREACH(flags)
   ENDIF(WIN32)
 

driver/CMakeLists.txt

@@ -299,17 +299,17 @@ IF(WIN32)
 #    LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMTD /NODEFAULTLIB:LIBCMT"
 #    LINK_FLAGS_RELWITHDEBINFO "/NODEFAULTLIB:LIBCMT"
 #    LINK_FLAGS_RELEASE "/NODEFAULTLIB:LIBCMT")
-#
+
 #  SET_TARGET_PROPERTIES(mysqlcppconn-static PROPERTIES
 #    STATIC_LIBRARY_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMTD"
 #    STATIC_LIBRARY_FLAGS_RELWITHDEBINFO "/NODEFAULTLIB:LIBCMT"
 #    STATIC_LIBRARY_FLAGS_RELEASE "/NODEFAULTLIB:LIBCMT")
 
-  # Changing CRT from dynamic to static
-  IF(MYSQLCLIENT_STATIC_BINDING)
-    INCLUDE(${CMAKE_SOURCE_DIR}/changeCrt.cmake)
-    CHANGE_CRT("/MT")
-  ENDIF()
+#  # Changing CRT from static to dynamic
+#  IF(MYSQLCLIENT_STATIC_BINDING)
+#    INCLUDE(${CMAKE_SOURCE_DIR}/changeCrt.cmake)
+#    CHANGE_CRT("/MD")
+#  ENDIF()
 
   INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
     RUNTIME DESTINATION lib