Skip to content

Commit ef2facc

Browse files
committed
WL#9053: Group Replication: Push Group Replication Plugin to mysql-trunk
Use LINK_LIBRARIES and DEPENDENCIES arguments of MYSQL_ADD_PLUGIN instead of explicitly use TARGET_LINK_LIBRARIES macro.
1 parent a3e501d commit ef2facc

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

rapid/plugin/group_replication/CMakeLists.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,21 @@ ADD_CONVENIENCE_LIBRARY(gr_unit_test_resource
6969
)
7070
SET_TARGET_PROPERTIES(gr_unit_test_resource PROPERTIES COMPILE_DEFINITIONS "DISABLE_ALL_PSI")
7171

72-
MYSQL_ADD_PLUGIN(group_replication ${GROUP_REPLICATION_SOURCES}
73-
MODULE_ONLY MODULE_OUTPUT_NAME "group_replication")
74-
7572
SET(WITH_UNIT_TESTS OFF)
7673
IF(CMAKE_BUILD_TYPE MATCHES "Debug")
7774
SET(WITH_DEBUG_OUTPUT ON)
7875
ENDIF()
7976
SET(SKIP_GCS_SHARED_LIB ON CACHE INTERNAL "Disables shared libraries")
8077
SET(SKIP_INSTALL_MYSQL_GCS ON CACHE INTERNAL "Disables installation targets")
78+
8179
ADD_SUBDIRECTORY(libmysqlgcs)
80+
8281
GET_PROPERTY(LIBRARIES_TO_LINK_MYSQL_GCS GLOBAL PROPERTY LIBRARIES_TO_LINK_MYSQL_GCS)
8382

84-
TARGET_LINK_LIBRARIES(group_replication mysql_gcs)
85-
IF(LIBRARIES_TO_LINK_MYSQL_GCS)
86-
TARGET_LINK_LIBRARIES(group_replication ${LIBRARIES_TO_LINK_MYSQL_GCS})
87-
ENDIF()
83+
MYSQL_ADD_PLUGIN(group_replication ${GROUP_REPLICATION_SOURCES}
84+
LINK_LIBRARIES mysql_gcs ${LIBRARIES_TO_LINK_MYSQL_GCS}
85+
DEPENDENCIES mysql_gcs
86+
MODULE_ONLY MODULE_OUTPUT_NAME "group_replication")
8887

8988
IF(INSTALL_MYSQLTESTDIR)
9089
INSTALL(

0 commit comments

Comments
 (0)