Fix Windows Runtime Library

Author: silvakid

CMakeLists.txt

@@ -89,12 +89,37 @@ 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" OFF)
+
+if(WIN32)
+  IF(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)
+ ELSE(STATIC_MSVCRT)
+    foreach(LANG C CXX)
+      set(CMAKE_${LANG}_FLAGS "${CMAKE_${LANG}_FLAGS} /MD")
+      foreach(TYPE RELEASE RELWITHDEBINFO MINSIZEREL)
+        set(CMAKE_${LANG}_FLAGS_${TYPE} "${CMAKE_${LANG}_FLAGS_${TYPE}} /MD")
+      endforeach()
+      set(CMAKE_${LANG}_FLAGS_DEBUG "${CMAKE_${LANG}_FLAGS_DEBUG} /MDd")
+    endforeach(LANG)
+ ENDIF(STATIC_MSVCRT)
+
+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

driver/mysql_art_resultset.h

@@ -46,7 +46,7 @@ namespace mysql
 
 class MySQL_DebugLogger;
 
-class MyVal
+class CPPCONN_PUBLIC_FUNC MyVal
 {
 	union {
 		sql::SQLString * str;

test/unit/classes/CMakeLists.txt

@@ -198,16 +198,8 @@ SET_TARGET_PROPERTIES(test_art_resultset PROPERTIES
           OUTPUT_NAME "art_resultset"
           LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
           COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
+TARGET_LINK_LIBRARIES(test_art_resultset ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
 
-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")
-ELSE(WIN32)
-  TARGET_LINK_LIBRARIES(test_art_resultset ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
-ENDIF(WIN32)
 
 MESSAGE(STATUS "Configuring unit tests - art_resultset")