Bug#24555770: X PLUGIN FILES ARE BUILT WITH DIFFERENT OPTIONS

Change how X plugin is built. Use a single MYSQL_ADD_PLUGIN
rather than ADD_CONVENIENCE_LIBRARY + MYSQL_ADD_PLUGIN.
This ensures that all files are built in the same way.

Author: jhauglid

rapid/plugin/x/CMakeLists.txt

@@ -111,6 +111,11 @@ ELSE()
     SET(xplugin_PROTOBUF_LIB ${PROTOBUF_LITE_LIBRARY})
   ENDIF()
 
+  # Do not LINK_LIBRARIES below, do TARGET_LINK_LIBRARIES instead.
+  IF(WITH_PROTOBUF STREQUAL "system")
+    SET(xplugin_PROTOBUF_LIB)
+  ENDIF()
+
   IF(MSVC)
     ADD_COMPILE_FLAGS(${PROTO_SRCS} ${PROTO_LITE_SRCS} COMPILE_FLAGS "/wd4018")
   ENDIF(MSVC)
@@ -124,10 +129,6 @@ ELSE()
       ${BOOST_SOURCES_DIR}/libs/atomic/src/lockpool.cpp)
   ENDIF()
 
-  # Built *without* -DMYSQL_DYNAMIC_PLUGIN
-  ADD_CONVENIENCE_LIBRARY(xplugin
-    ${xplugin_SRC} ${xplugin_HDRS} ${xplugin_PROTOBUF_SRC} ${BOOST_LIB_SOURCES})
-
   ADD_COMPILE_FLAGS(
     src/xpl_plugin.cc
     src/xpl_performance_schema.cc
@@ -136,21 +137,20 @@ ELSE()
     "-I${xplugin_PROTOBUF_DIR}"
     "-I${CMAKE_CURRENT_BINARY_DIR}/generated/")
 
-  TARGET_LINK_LIBRARIES(xplugin ${LIBEVENT_LIBRARY} ${LIBEVENT_LIBRARIES})
-  IF(MSVC)
-    TARGET_LINK_LIBRARIES(xplugin strings) 
-  ENDIF(MSVC)
-  
-  # These are built *with* -DMYSQL_DYNAMIC_PLUGIN
   MYSQL_ADD_PLUGIN(mysqlx
     src/xpl_plugin.cc
     src/xpl_performance_schema.cc
-    LINK_LIBRARIES xplugin ${xplugin_PROTOBUF_LIB}
+    ${xplugin_SRC} ${xplugin_HDRS} ${xplugin_PROTOBUF_SRC} ${BOOST_LIB_SOURCES}
+    LINK_LIBRARIES ${xplugin_PROTOBUF_LIB} ${LIBEVENT_LIBRARY} ${LIBEVENT_LIBRARIES}
     MODULE_ONLY MODULE_OUTPUT_NAME "mysqlx")
 
-  ADD_DEPENDENCIES(xplugin GenError)
+  IF(WITH_PROTOBUF STREQUAL "system")
+    TARGET_LINK_LIBRARIES(mysqlx "${PROTOBUF_LIBRARY}")
+  ENDIF()
+
+  ADD_DEPENDENCIES(mysqlx GenError)
   IF (WITH_LIBEVENT STREQUAL "bundled")
-    ADD_DEPENDENCIES(xplugin ${LIBEVENT_LIBRARY})
+    ADD_DEPENDENCIES(mysqlx ${LIBEVENT_LIBRARY})
   ENDIF()
 
   IF(XPLUGIN_LOG_PROTOBUF)

rapid/unittest/gunit/xplugin/CMakeLists.txt

@@ -26,7 +26,6 @@ INCLUDE(CTest)
 INCLUDE(${PROJECT_SOURCE_DIR}/rapid/plugin/x/mysqlx_protobuf.cmake)
 
 INCLUDE(${PROJECT_SOURCE_DIR}/rapid/plugin/x/source_files.cmake)
-LIST(REMOVE_ITEM xplugin_SRC "${MYSQLX_PROJECT_DIR}/src/mysql_variables.cc")
 
 MYSQLX_PROTOBUF_GENERATE_CPP_NAMES(protobuf_SRC ${PROTOBUF_MYSQLX_FILES})
 
@@ -127,7 +126,6 @@ ENDIF(WIN32)
 
 TARGET_LINK_LIBRARIES(
   xplugin_unit_tests
-  xplugin
   gtest
   regex
   gmock