From 3d4dc48c8b4078cf59b57e86c9262c6c179b9b8e Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Sat, 20 Sep 2014 20:24:04 +0300 Subject: [PATCH] fixed double linking of the embedded library in a statically built internal library --- server/core/CMakeLists.txt | 2 +- server/core/test/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt index 1ec49955c..2c7854de3 100644 --- a/server/core/CMakeLists.txt +++ b/server/core/CMakeLists.txt @@ -1,6 +1,6 @@ file(GLOB FULLCORE_SRC *.c) add_library(fullcore STATIC ${FULLCORE_SRC}) -target_link_libraries(fullcore log_manager utils aio pthread crypt dl ${EMBEDDED_LIB} crypto inih z) +target_link_libraries(fullcore log_manager utils pthread ${EMBEDDED_LIB} ssl aio rt crypt dl crypto inih z m stdc++) add_executable(maxscale atomic.c buffer.c spinlock.c gateway.c gw_utils.c utils.c dcb.c load_utils.c session.c service.c server.c diff --git a/server/core/test/CMakeLists.txt b/server/core/test/CMakeLists.txt index 35bced9e6..914fe277e 100644 --- a/server/core/test/CMakeLists.txt +++ b/server/core/test/CMakeLists.txt @@ -2,10 +2,10 @@ add_executable(test_hash testhash.c) add_executable(test_spinlock testspinlock.c) add_executable(test_filter testfilter.c) add_executable(test_adminusers testadminusers.c) -target_link_libraries(test_hash crypto ssl pthread log_manager fullcore) -target_link_libraries(test_spinlock crypto ssl pthread log_manager fullcore) -target_link_libraries(test_filter crypto ssl pthread log_manager fullcore rt) -target_link_libraries(test_adminusers crypto crypt ${EMBEDDED_LIB} ssl fullcore rt m z) +target_link_libraries(test_hash fullcore) +target_link_libraries(test_spinlock fullcore) +target_link_libraries(test_filter fullcore) +target_link_libraries(test_adminusers fullcore) add_test(TestHash test_hash) add_test(TestSpinlock test_spinlock) add_test(TestFilter test_filter)