Changing windows build from /MD (Dynamic CRT lib) to /MT (static CRT

lib) due to the changes on libmysqlclient.

Author: silvakid

CMakeLists.txt

@@ -80,6 +80,12 @@ 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)
 
 #-----------------
 # ICU

driver/CMakeLists.txt

@@ -295,15 +295,15 @@ SET_TARGET_PROPERTIES(mysqlcppconn
   LINK_INTERFACE_LIBRARIES "")
 
 IF(WIN32)
-  SET_TARGET_PROPERTIES(mysqlcppconn PROPERTIES
-    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")
+#  SET_TARGET_PROPERTIES(mysqlcppconn PROPERTIES
+#    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
   #INCLUDE(${CMAKE_SOURCE_DIR}/changeCrt.cmake)

test/unit/classes/CMakeLists.txt

@@ -201,10 +201,10 @@ SET_TARGET_PROPERTIES(test_art_resultset PROPERTIES
 
 IF(WIN32)
   TARGET_LINK_LIBRARIES(test_art_resultset ${MY_TARGET_LINK_LIBRARIES_STATIC_CPPLIB} ${MY_GCOV_LINK_LIBRARIES})
-  SET_TARGET_PROPERTIES(test_art_resultset PROPERTIES
-    LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMTD /NODEFAULTLIB:LIBCMT"
-    LINK_FLAGS_RELWITHDEBINFO "/NODEFAULTLIB:LIBCMT"
-    LINK_FLAGS_RELEASE "/NODEFAULTLIB:LIBCMT")
+#  SET_TARGET_PROPERTIES(test_art_resultset PROPERTIES
+#    LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMTD /NODEFAULTLIB:LIBCMT"
+#    LINK_FLAGS_RELWITHDEBINFO "/NODEFAULTLIB:LIBCMT"
+#    LINK_FLAGS_RELEASE "/NODEFAULTLIB:LIBCMT")
 ELSE(WIN32)
   TARGET_LINK_LIBRARIES(test_art_resultset ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
 ENDIF(WIN32)