Merge branch 'wl15466' into trunk

Change-Id: I406fb41b6051cb2b2e898d9fc2bcf2d1ba1e9884

Author: silvakid

jdbc/CMakeLists.txt

@@ -86,7 +86,7 @@ endif(jdbc_stand_alone)
 
 
 
-add_config_option(MYSQLCLIENT_STATIC_LINKING BOOL ADVANCED DEFAULT ON "enable libmysqlclient static linking")
+add_config_option(MYSQLCLIENT_STATIC_LINKING BOOL ADVANCED DEFAULT OFF "enable libmysqlclient static linking")
 add_config_option(MYSQLCLIENT_STATIC_BINDING BOOL ADVANCED DEFAULT ON "enable libmysqlclient static binding")
 
 

jdbc/examples/CMakeLists.txt

@@ -112,6 +112,11 @@ IF(MYSQLCPPCONN_BUILD_EXAMPLES)
       )
     ENDIF(WIN32)
 
+    if(NOT MYSQLCLIENT_STATIC_LINKING)
+      list(APPEND MY_TARGET_LINK_LIBRARIES MySQL::client)
+    endif()
+
+
     ADD_DEFINITIONS("-DDYNLOAD_MYSQL_LIB=\"${MYSQLCPPCONN_DYNLOAD_MYSQL_LIB}\"")
     MESSAGE(STATUS "MySQL dynamic load test library: ${MYSQLCPPCONN_DYNLOAD_MYSQL_LIB}")
 

jdbc/test/CJUnitTestsPort/CMakeLists.txt

@@ -37,6 +37,10 @@ ELSEIF(NOT WIN32)
   SET(MY_TARGET_LINK_LIBRARIES connector-jdbc test_framework)
 ENDIF(WIN32)
 
+if(NOT MYSQLCLIENT_STATIC_LINKING)
+  list(APPEND MY_TARGET_LINK_LIBRARIES MySQL::client)
+endif()
+
 IF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE)
   SET(MY_GCOV_LINK_LIBRARIES gcov)
 ENDIF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE)

jdbc/test/CMakeLists.txt

@@ -56,6 +56,10 @@ ELSEIF(NOT WIN32)
   SET(MY_TARGET_LINK_LIBRARIES connector-jdbc)
 ENDIF(WIN32)
 
+if(NOT MYSQLCLIENT_STATIC_LINKING)
+  list(APPEND MY_TARGET_LINK_LIBRARIES MySQL::client)
+endif()
+
 IF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE)
   SET(MY_GCOV_LINK_LIBRARIES gcov)
 ENDIF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE)

jdbc/test/unit/CMakeLists.txt

@@ -93,6 +93,10 @@ ELSEIF(NOT WIN32)
   )
 ENDIF(WIN32)
 
+if(NOT MYSQLCLIENT_STATIC_LINKING)
+  list(APPEND MY_TARGET_LINK_LIBRARIES MySQL::client)
+endif()
+
 IF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE)
   SET(MY_GCOV_LINK_LIBRARIES gcov)
 ENDIF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE)