From bff2d794e0ac9f5cdf5b2ae888d715302f0adce6 Mon Sep 17 00:00:00 2001 From: VilhoRaatikka Date: Wed, 1 Oct 2014 13:29:26 +0300 Subject: [PATCH] Removed unnecessary linking commands to libmysqld.a --- query_classifier/CMakeLists.txt | 3 +-- server/modules/monitor/CMakeLists.txt | 8 ++++---- server/modules/routing/readwritesplit/CMakeLists.txt | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/query_classifier/CMakeLists.txt b/query_classifier/CMakeLists.txt index 8f8ab0186..42270cd2c 100644 --- a/query_classifier/CMakeLists.txt +++ b/query_classifier/CMakeLists.txt @@ -1,6 +1,5 @@ add_library(query_classifier SHARED query_classifier.cc) -target_link_libraries(query_classifier ${EMBEDDED_LIB}) install(TARGETS query_classifier DESTINATION lib) if(BUILD_TESTS) add_subdirectory(test) -endif() \ No newline at end of file +endif() diff --git a/server/modules/monitor/CMakeLists.txt b/server/modules/monitor/CMakeLists.txt index d94312682..ac765e98d 100644 --- a/server/modules/monitor/CMakeLists.txt +++ b/server/modules/monitor/CMakeLists.txt @@ -1,11 +1,11 @@ add_library(mysqlmon SHARED mysql_mon.c) -target_link_libraries(mysqlmon log_manager utils ${EMBEDDED_LIB}) +target_link_libraries(mysqlmon log_manager utils) install(TARGETS mysqlmon DESTINATION modules) add_library(galeramon SHARED galera_mon.c) -target_link_libraries(galeramon log_manager utils ${EMBEDDED_LIB}) +target_link_libraries(galeramon log_manager utils) install(TARGETS galeramon DESTINATION modules) add_library(ndbclustermon SHARED ndbcluster_mon.c) -target_link_libraries(ndbclustermon log_manager utils ${EMBEDDED_LIB}) -install(TARGETS ndbclustermon DESTINATION modules) \ No newline at end of file +target_link_libraries(ndbclustermon log_manager utils) +install(TARGETS ndbclustermon DESTINATION modules) diff --git a/server/modules/routing/readwritesplit/CMakeLists.txt b/server/modules/routing/readwritesplit/CMakeLists.txt index 2821ca3ed..6960d4c8d 100644 --- a/server/modules/routing/readwritesplit/CMakeLists.txt +++ b/server/modules/routing/readwritesplit/CMakeLists.txt @@ -1,6 +1,6 @@ add_library(readwritesplit SHARED readwritesplit.c) -target_link_libraries(readwritesplit ssl pthread log_manager utils query_classifier ${EMBEDDED_LIB}) +target_link_libraries(readwritesplit ssl pthread log_manager utils query_classifier) install(TARGETS readwritesplit DESTINATION modules) if(BUILD_TESTS) add_subdirectory(test) -endif() \ No newline at end of file +endif()