From: Joel Cornett Date: Tue, 19 Apr 2016 17:18:34 +0000 (-0400) Subject: linked catch tests lib against framework X-Git-Tag: 3.0.0-233~446^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d339ebe6c8f59b4b7a1fbcdee4d6f40245b7c8b2;p=thirdparty%2Fsnort3.git linked catch tests lib against framework --- diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt index 6399d2dc0..450bb7c70 100644 --- a/src/framework/CMakeLists.txt +++ b/src/framework/CMakeLists.txt @@ -40,6 +40,8 @@ install (FILES ${FRAMEWORK_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}/api_options.h DESTINATION "${INCLUDE_INSTALL_PATH}/framework" ) +target_link_libraries ( framework catch_tests ) + add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/api_options.h COMMAND grep API_OPTIONS ${CMAKE_BINARY_DIR}/config.h > ${CMAKE_CURRENT_BINARY_DIR}/api_options.h diff --git a/src/host_tracker/test/CMakeLists.txt b/src/host_tracker/test/CMakeLists.txt index 527c10770..b624b7023 100644 --- a/src/host_tracker/test/CMakeLists.txt +++ b/src/host_tracker/test/CMakeLists.txt @@ -1,13 +1,11 @@ set ( HOST_TRACKER_MODULE_LIBS - catch_tests framework - host_tracker sfip ${DNET_LIBRARIES} ) add_cpputest(host_cache_test host_tracker) -add_cpputest(host_cache_module_test ${HOST_TRACKER_MODULE_LIBS} hash) -add_cpputest(host_tracker_module_test ${HOST_TRACKER_MODULE_LIBS}) +add_cpputest(host_cache_module_test host_tracker ${HOST_TRACKER_MODULE_LIBS} hash) +add_cpputest(host_tracker_module_test host_tracker ${HOST_TRACKER_MODULE_LIBS}) add_cpputest(host_tracker_test host_tracker)