Changed the order of linking to resolve some debug build bugs and added the missing parent directory of the MYSQL_DIR into the included directories.

This commit is contained in:
Markus Makela
2014-09-20 19:44:30 +03:00
parent 8427b83884
commit 3f0de666ac
11 changed files with 29 additions and 29 deletions

View File

@ -1,20 +1,20 @@
file(GLOB FULLCORE_SRC *.c)
add_library(fullcore STATIC ${FULLCORE_SRC})
target_link_libraries(fullcore utils log_manager aio pthread crypt dl ${EMBEDDED_LIB} crypto inih z)
target_link_libraries(fullcore log_manager utils aio pthread crypt dl ${EMBEDDED_LIB} crypto inih z)
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
poll.c config.c users.c hashtable.c dbusers.c thread.c gwbitmask.c
monitor.c adminusers.c secrets.c filter.c modutil.c hint.c housekeeper.c)
target_link_libraries(maxscale ${EMBEDDED_LIB} utils log_manager ssl aio pthread crypt dl crypto inih z rt m stdc++)
target_link_libraries(maxscale ${EMBEDDED_LIB} log_manager utils ssl aio pthread crypt dl crypto inih z rt m stdc++)
install(TARGETS maxscale DESTINATION bin)
add_executable(maxkeys maxkeys.c secrets.c utils.c)
target_link_libraries(maxkeys utils log_manager pthread crypt crypto)
target_link_libraries(maxkeys log_manager utils pthread crypt crypto)
install(TARGETS maxkeys DESTINATION bin)
add_executable(maxpasswd maxpasswd.c secrets.c utils.c)
target_link_libraries(maxpasswd utils log_manager pthread crypt crypto)
target_link_libraries(maxpasswd log_manager utils pthread crypt crypto)
install(TARGETS maxpasswd DESTINATION bin)
if(BUILD_TESTS)