hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed double linking of the embedded library in a statically built internal library

Browse Source
This commit is contained in:
Markus Makela 2014-09-20 20:24:04 +03:00
parent 3f0de666ac
commit 3d4dc48c8b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/CMakeLists.txt
View File

@ -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

8
server/core/test/CMakeLists.txt
View File

@ -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)