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,4 +1,4 @@
add_library(log_manager SHARED log_manager.cc ${CMAKE_SOURCE_DIR}/utils/skygw_utils.cc)
add_library(log_manager SHARED log_manager.cc)
target_link_libraries(log_manager pthread aio stdc++)
install(TARGETS log_manager DESTINATION lib)
if(BUILD_TESTS)

View File

@ -1,5 +1,5 @@
add_executable(testlog testlog.c)
add_executable(testorder testorder.c)
target_link_libraries(testlog utils pthread log_manager)
target_link_libraries(testorder utils pthread log_manager)
target_link_libraries(testlog pthread log_manager utils)
target_link_libraries(testorder pthread log_manager utils)
add_test(NAME TestLogOrder COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logorder.sh ${CMAKE_CURRENT_BINARY_DIR}/test.log 500 0 500 ${CMAKE_CURRENT_BINARY_DIR})