Bug #34689226 Add an argument WIN_DEF_FILE to MYSQL_ADD_PLUGIN

Several plugins have linker options "/DEF:xxxx", wrapped in IF(WIN32).
Extend the MYSQL_ADD_PLUGIN macro to handle the option.

Change-Id: I6ea4f55f3edb21dcea3680dd210bc577f671cd41

Author: Tor Didriksen

cmake/plugin.cmake

@@ -38,6 +38,7 @@ MACRO(MYSQL_ADD_PLUGIN plugin_arg)
     )
   SET(PLUGIN_ONE_VALUE_KW
     MODULE_OUTPUT_NAME
+    WIN_DEF_FILE
     )
   SET(PLUGIN_MULTI_VALUE_KW
     DEPENDENCIES   # target1 ... targetN
@@ -275,6 +276,10 @@ MACRO(MYSQL_ADD_PLUGIN plugin_arg)
     TARGET_LINK_LIBRARIES (${target} ${ARG_LINK_LIBRARIES})
   ENDIF()
 
+  IF(BUILD_PLUGIN AND WIN32 AND ARG_WIN_DEF_FILE)
+    MY_TARGET_LINK_OPTIONS(${target} "/DEF:${ARG_WIN_DEF_FILE}")
+  ENDIF()
+
   IF(BUILD_PLUGIN AND ARG_VISIBILITY_HIDDEN AND UNIX)
     TARGET_COMPILE_OPTIONS(${target} PRIVATE "-fvisibility=hidden")
   ENDIF()

plugin/rewriter/CMakeLists.txt

@@ -28,6 +28,7 @@ MYSQL_ADD_PLUGIN(rewriter
   services.cc
   MODULE_ONLY
   MODULE_OUTPUT_NAME "rewriter"
+  WIN_DEF_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rewriter_udf.def"
   )
 
 # MYSQL_ADD_PLUGIN may have decided not to build it.
@@ -38,17 +39,13 @@ ENDIF()
 ADD_DEFINITIONS(-DMYSQL_SERVER)
 ADD_DEFINITIONS(-DLOG_COMPONENT_TAG="Rewriter")
 
+# We should use CMAKE_SHARED_LIBRARY_SUFFIX, but we do not use .dylib on Mac.
 IF(WIN32)
   SET(DYNLIB_EXTENSION "dll")
-  MY_TARGET_LINK_OPTIONS(rewriter
-    "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/rewriter_udf.def"
-    )
 ELSE()
   SET(DYNLIB_EXTENSION "so")
 ENDIF()
 
-
-
 #
 # This installs all the scripts.
 #

plugin/test_service_sql_api/CMakeLists.txt

@@ -60,15 +60,9 @@ MYSQL_ADD_PLUGIN(test_session_attach
   MODULE_ONLY
   MODULE_OUTPUT_NAME "libtest_session_attach"
   TEST_ONLY
+  WIN_DEF_FILE "${CMAKE_CURRENT_SOURCE_DIR}/test_session_attach.def"
   )
 
-# MYSQL_ADD_PLUGIN may have decided not to build it.
-IF(WIN32 AND TARGET test_session_attach)
-  MY_TARGET_LINK_OPTIONS(test_session_attach
-    "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/test_session_attach.def"
-    )
-ENDIF()
-
 # Test SQL API
 MYSQL_ADD_PLUGIN(test_sql_complex
   test_sql_complex.cc

sql/CMakeLists.txt

@@ -1396,24 +1396,17 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites
   )
 
 MYSQL_ADD_PLUGIN(udf_example udf_example.cc
-  MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example"
+  MODULE_ONLY
+  TEST_ONLY
+  MODULE_OUTPUT_NAME "udf_example"
+  WIN_DEF_FILE "${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def"
   )
-# MYSQL_ADD_PLUGIN may have decided not to build it.
-IF(WIN32 AND TARGET udf_example)
-  SET_TARGET_PROPERTIES(udf_example
-    PROPERTIES LINK_FLAGS
-    "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
-ENDIF()
 
 MYSQL_ADD_PLUGIN(locking_service locking_service_udf.cc
-  MODULE_ONLY MODULE_OUTPUT_NAME "locking_service"
+  MODULE_ONLY
+  MODULE_OUTPUT_NAME "locking_service"
+  WIN_DEF_FILE "${CMAKE_CURRENT_SOURCE_DIR}/locking_service.def"
   )
-# MYSQL_ADD_PLUGIN may have decided not to build it.
-IF(WIN32 AND TARGET locking_service)
-  SET_TARGET_PROPERTIES(locking_service
-    PROPERTIES LINK_FLAGS
-    "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/locking_service.def")
-ENDIF()
 
 FOREACH(tool gtar tar git)
   STRING(TOUPPER ${tool}  TOOL)