From b446e4d14a0694d23573d77672ef6d70c51d6a08 Mon Sep 17 00:00:00 2001 From: Maximilien Siavelis <maximilien.siavelis@simulease.com> Date: 周五, 05 1月 2018 09:10:37 +0800 Subject: [PATCH] make install and some cleanup --- test/functional/CMakeLists.txt | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/test/functional/CMakeLists.txt b/test/functional/CMakeLists.txt index a343dc6..9ec800e 100644 --- a/test/functional/CMakeLists.txt +++ b/test/functional/CMakeLists.txt @@ -1,6 +1,7 @@ ADD_LIBRARY(license_generator_snippet STATIC generate-license.cpp ) + target_link_libraries( license_generator_snippet license_generator_lib @@ -10,23 +11,47 @@ standard_license_test standard-license_test.cpp ) + target_link_libraries( standard_license_test license++_static license_generator_snippet + ${Boost_LIBRARIES} ) -SET_TARGET_PROPERTIES(standard_license_test PROPERTIES LINK_SEARCH_START_STATIC ON) +#SET_TARGET_PROPERTIES(standard_license_test PROPERTIES LINK_SEARCH_START_STATIC ON) +#add_dependencies( standard_license_test boost_test boost_filesystem ) add_executable( date_test date_test.cpp ) + target_link_libraries( date_test license++_static license_generator_snippet + ${Boost_LIBRARIES} ) -SET_TARGET_PROPERTIES(date_test PROPERTIES LINK_SEARCH_START_STATIC ON) +#SET_TARGET_PROPERTIES(date_test PROPERTIES LINK_SEARCH_START_STATIC ON) +#add_dependencies( date_test boost_test boost_filesystem ) + +add_executable( + volid_test + volid_test.cpp +) + +target_link_libraries( + volid_test + license++_static + license_generator_snippet + ${Boost_LIBRARIES} +) + +#SET_TARGET_PROPERTIES(volid_test PROPERTIES LINK_SEARCH_START_STATIC ON) +#add_dependencies( volid_test boost_test boost_filesystem ) ADD_TEST(standard_license_test ${EXECUTABLE_OUTPUT_PATH}/standard_license_test) -ADD_TEST(date_test ${EXECUTABLE_OUTPUT_PATH}/date_test) \ No newline at end of file +ADD_TEST(date_test ${EXECUTABLE_OUTPUT_PATH}/date_test) +ADD_TEST(volid_test ${EXECUTABLE_OUTPUT_PATH}/volid_test) + +install(TARGETS standard_license_test date_test volid_test RUNTIME DESTINATION bin) -- Gitblit v1.9.1