diff --git a/server/modules/filter/CMakeLists.txt b/server/modules/filter/CMakeLists.txt index 6bf6a5daa..0c1e842be 100644 --- a/server/modules/filter/CMakeLists.txt +++ b/server/modules/filter/CMakeLists.txt @@ -2,48 +2,48 @@ if(BUILD_RABBITMQ) find_package(RabbitMQ) include_directories(${RABBITMQ_HEADERS}) add_library(mqfilter SHARED mqfilter.c) - target_link_libraries(mqfilter query_classifier log_manager utils ${RABBITMQ_LIBRARIES}) + target_link_libraries(mqfilter query_classifier log_manager ${RABBITMQ_LIBRARIES}) install(TARGETS mqfilter DESTINATION ${MAXSCALE_LIBDIR}) endif() add_library(regexfilter SHARED regexfilter.c) -target_link_libraries(regexfilter log_manager utils) +target_link_libraries(regexfilter log_manager) install(TARGETS regexfilter DESTINATION ${MAXSCALE_LIBDIR}) add_library(testfilter SHARED testfilter.c) -target_link_libraries(testfilter log_manager utils) +target_link_libraries(testfilter log_manager) install(TARGETS testfilter DESTINATION ${MAXSCALE_LIBDIR}) add_library(qlafilter SHARED qlafilter.c) -target_link_libraries(qlafilter log_manager utils) +target_link_libraries(qlafilter log_manager) install(TARGETS qlafilter DESTINATION ${MAXSCALE_LIBDIR}) add_library(tee SHARED tee.c) -target_link_libraries(tee log_manager utils) +target_link_libraries(tee log_manager) install(TARGETS tee DESTINATION ${MAXSCALE_LIBDIR}) add_library(topfilter SHARED topfilter.c) -target_link_libraries(topfilter log_manager utils) +target_link_libraries(topfilter log_manager) install(TARGETS topfilter DESTINATION ${MAXSCALE_LIBDIR}) add_library(dbfwfilter SHARED dbfwfilter.c) -target_link_libraries(dbfwfilter log_manager utils query_classifier) +target_link_libraries(dbfwfilter log_manager query_classifier) install(TARGETS dbfwfilter DESTINATION ${MAXSCALE_LIBDIR}) add_library(namedserverfilter SHARED namedserverfilter.c) -target_link_libraries(namedserverfilter log_manager utils) +target_link_libraries(namedserverfilter log_manager) install(TARGETS namedserverfilter DESTINATION ${MAXSCALE_LIBDIR}) if(BUILD_SLAVELAG) add_library(slavelag SHARED slavelag.c) - target_link_libraries(slavelag log_manager utils query_classifier) + target_link_libraries(slavelag log_manager query_classifier) install(TARGETS slavelag DESTINATION ${MAXSCALE_LIBDIR}) endif() if(BUILD_TOOLS) add_executable(ruleparser dbfwfilter.c) target_compile_definitions(ruleparser PUBLIC "BUILD_RULE_PARSER") - target_link_libraries(ruleparser ${EMBEDDED_LIB} log_manager utils query_classifier fullcore) + target_link_libraries(ruleparser ${EMBEDDED_LIB} log_manager query_classifier fullcore) install(TARGETS ruleparser DESTINATION ${MAXSCALE_BINDIR}) endif() diff --git a/server/modules/monitor/CMakeLists.txt b/server/modules/monitor/CMakeLists.txt index b32f46c30..ab275cf46 100644 --- a/server/modules/monitor/CMakeLists.txt +++ b/server/modules/monitor/CMakeLists.txt @@ -1,16 +1,16 @@ add_library(mysqlmon SHARED mysql_mon.c monitor_common.c) -target_link_libraries(mysqlmon log_manager utils) +target_link_libraries(mysqlmon log_manager) install(TARGETS mysqlmon DESTINATION ${MAXSCALE_LIBDIR}) add_library(galeramon SHARED galeramon.c monitor_common.c) -target_link_libraries(galeramon log_manager utils) +target_link_libraries(galeramon log_manager) install(TARGETS galeramon DESTINATION ${MAXSCALE_LIBDIR}) add_library(ndbclustermon SHARED ndbclustermon.c monitor_common.c) -target_link_libraries(ndbclustermon log_manager utils) +target_link_libraries(ndbclustermon log_manager) install(TARGETS ndbclustermon DESTINATION ${MAXSCALE_LIBDIR}) if(BUILD_MMMON) add_library(mmmon SHARED mmmon.c monitor_common.c) - target_link_libraries(mmmon log_manager utils) + target_link_libraries(mmmon log_manager) install(TARGETS mmmon DESTINATION ${MAXSCALE_LIBDIR}) endif() diff --git a/server/modules/protocol/CMakeLists.txt b/server/modules/protocol/CMakeLists.txt index 124071c44..5015499b0 100644 --- a/server/modules/protocol/CMakeLists.txt +++ b/server/modules/protocol/CMakeLists.txt @@ -1,17 +1,17 @@ add_library(MySQLClient SHARED mysql_client.c mysql_common.c) -target_link_libraries(MySQLClient log_manager utils) +target_link_libraries(MySQLClient log_manager ) install(TARGETS MySQLClient DESTINATION ${MAXSCALE_LIBDIR}) add_library(MySQLBackend SHARED mysql_backend.c mysql_common.c) -target_link_libraries(MySQLBackend log_manager utils) +target_link_libraries(MySQLBackend log_manager ) install(TARGETS MySQLBackend DESTINATION ${MAXSCALE_LIBDIR}) add_library(telnetd SHARED telnetd.c) -target_link_libraries(telnetd log_manager utils) +target_link_libraries(telnetd log_manager ) install(TARGETS telnetd DESTINATION ${MAXSCALE_LIBDIR}) add_library(HTTPD SHARED httpd.c) -target_link_libraries(HTTPD log_manager utils) +target_link_libraries(HTTPD log_manager ) install(TARGETS HTTPD DESTINATION ${MAXSCALE_LIBDIR}) if(BUILD_TESTS) @@ -21,7 +21,7 @@ if(BUILD_TESTS) endif() add_library(maxscaled SHARED maxscaled.c) -target_link_libraries(maxscaled log_manager utils) +target_link_libraries(maxscaled log_manager ) install(TARGETS maxscaled DESTINATION ${MAXSCALE_LIBDIR}) diff --git a/server/modules/routing/CMakeLists.txt b/server/modules/routing/CMakeLists.txt index d51c8260b..22e294537 100644 --- a/server/modules/routing/CMakeLists.txt +++ b/server/modules/routing/CMakeLists.txt @@ -1,20 +1,20 @@ if(BUILD_TESTS) add_subdirectory(test) add_library(testroute SHARED testroute.c) - target_link_libraries(testroute log_manager utils) + target_link_libraries(testroute log_manager) install(TARGETS testroute DESTINATION ${MAXSCALE_LIBDIR}) endif() add_library(readconnroute SHARED readconnroute.c) -target_link_libraries(readconnroute log_manager utils) +target_link_libraries(readconnroute log_manager) install(TARGETS readconnroute DESTINATION ${MAXSCALE_LIBDIR}) add_library(debugcli SHARED debugcli.c debugcmd.c) -target_link_libraries(debugcli log_manager utils) +target_link_libraries(debugcli log_manager) install(TARGETS debugcli DESTINATION ${MAXSCALE_LIBDIR}) add_library(cli SHARED cli.c debugcmd.c) -target_link_libraries(cli log_manager utils) +target_link_libraries(cli log_manager) install(TARGETS cli DESTINATION ${MAXSCALE_LIBDIR}) add_subdirectory(readwritesplit) diff --git a/server/modules/routing/readwritesplit/CMakeLists.txt b/server/modules/routing/readwritesplit/CMakeLists.txt index c7e387290..3cc3861ca 100644 --- a/server/modules/routing/readwritesplit/CMakeLists.txt +++ b/server/modules/routing/readwritesplit/CMakeLists.txt @@ -1,5 +1,5 @@ add_library(readwritesplit SHARED readwritesplit.c) -target_link_libraries(readwritesplit ssl pthread log_manager utils query_classifier) +target_link_libraries(readwritesplit ssl pthread log_manager query_classifier) install(TARGETS readwritesplit DESTINATION ${MAXSCALE_LIBDIR}) if(BUILD_TESTS) add_subdirectory(test) diff --git a/server/modules/routing/schemarouter/CMakeLists.txt b/server/modules/routing/schemarouter/CMakeLists.txt index 930366f2b..ae8f295c2 100644 --- a/server/modules/routing/schemarouter/CMakeLists.txt +++ b/server/modules/routing/schemarouter/CMakeLists.txt @@ -1,9 +1,9 @@ add_library(schemarouter SHARED schemarouter.c sharding_common.c) -target_link_libraries(schemarouter log_manager utils query_classifier) +target_link_libraries(schemarouter log_manager query_classifier) install(TARGETS schemarouter DESTINATION ${MAXSCALE_LIBDIR}) add_library(shardrouter SHARED shardrouter.c svcconn.c sharding_common.c) -target_link_libraries(shardrouter log_manager utils query_classifier) +target_link_libraries(shardrouter log_manager query_classifier) install(TARGETS shardrouter DESTINATION ${MAXSCALE_LIBDIR}) if(BUILD_TESTS)