Bug #32882344: FIX MYSQLCLIENT_STATIC_BINDING=0 BUILD

silvakid · silvakid · commit e28b02425492 · 2021-05-25T18:47:39.000+01:00
diff --git a/jdbc b/jdbc
@@ -1 +1 @@
-Subproject commit 9266d7e9645f3009b75b17df469bb1d61afad57f
+Subproject commit 3f15af679286bb4c15ad1cdf2b208166db05ec92
diff --git a/jdbc.cmake b/jdbc.cmake
@@ -66,7 +66,19 @@ if(MYSQL_CONFIG_EXECUTABLE)
   list(APPEND jdbc_cmake_opts -DMYSQL_CONFIG_EXECUTABLE=${MYSQL_CONFIG_EXECUTABLE})
 endif()
 
-list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON)
+
+if(MYSQLCLIENT_STATIC_LINKING)
+  list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=${MYSQLCLIENT_STATIC_LINKING})
+else()
+  list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON)
+endif()
+
+if(MYSQLCLIENT_STATIC_BINDING)
+  list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_BINDING=${MYSQLCLIENT_STATIC_BINDING})
+else()
+  list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_BINDING=ON)
+endif()
+
 
 if(CMAKE_BUILD_TYPE)
   if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
