Bundle jdbc dependencies only if static linking with

libmysqlclient

Fix some CMAKE warnings.

Change-Id: I3db2506a283310ad2b3fe3bdbca73eb0ed35e568

Author: silvakid

jdbc/CMakeLists.txt

@@ -89,7 +89,10 @@ endif(jdbc_stand_alone)
 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")
 
-
+if(BUNDLE_DEPENDENCIES AND NOT MYSQLCLIENT_STATIC_LINKING)
+  message("Warning: When dynamic linking with libmysqlclient, BUNDLE_DEPENDENCIES will be turned off.")
+  set(BUNDLE_DEPENDENCIES OFF)
+endif()
 
 if(BUILD_STATIC)
   set(BUILD_SHARED_LIBS OFF)

jdbc/test/CMakeLists.txt

@@ -54,7 +54,7 @@ IF(MSBUILD)
   SET(MY_TARGET_LINK_LIBRARIES connector-jdbc)
 ELSEIF(NOT MSBUILD)
   SET(MY_TARGET_LINK_LIBRARIES connector-jdbc)
-ENDIF(WIN32)
+ENDIF()
 
 if(NOT MYSQLCLIENT_STATIC_LINKING)
   list(APPEND MY_TARGET_LINK_LIBRARIES MySQL::client)

jdbc/test/framework/CMakeLists.txt

@@ -77,7 +77,7 @@ IF(WIN32)
     ../common/stringutils.h
     ../common/file.h
     )
-ENDIF(WIN32 AND NOT CLANG)
+ENDIF(WIN32)
 
 ADD_LIBRARY(test_framework STATIC ${testframework_sources})
 SET_TARGET_PROPERTIES(test_framework PROPERTIES