From 82f9d834ad772b2f16b6524f679d14d8a7afe881 Mon Sep 17 00:00:00 2001 From: Gabriele Contini <gcontini@users.noreply.github.com> Date: 周二, 10 9月 2019 23:29:10 +0800 Subject: [PATCH] fix issue #37 tests in windows --- test/functional/CMakeLists.txt | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/test/functional/CMakeLists.txt b/test/functional/CMakeLists.txt index 242e77b..0fc9432 100644 --- a/test/functional/CMakeLists.txt +++ b/test/functional/CMakeLists.txt @@ -16,8 +16,7 @@ standard_license_test license++_static license_generator_snippet - ${Boost_filesystem_LIBRARY} - ${Boost_test_LIBRARY} + ${Boost_LIBRARIES} ) #SET_TARGET_PROPERTIES(standard_license_test PROPERTIES LINK_SEARCH_START_STATIC ON) #add_dependencies( standard_license_test boost_test boost_filesystem ) @@ -31,8 +30,7 @@ date_test license++_static license_generator_snippet - ${Boost_filesystem_LIBRARY} - ${Boost_test_LIBRARY} + ${Boost_LIBRARIES} ) #SET_TARGET_PROPERTIES(date_test PROPERTIES LINK_SEARCH_START_STATIC ON) #add_dependencies( date_test boost_test boost_filesystem ) @@ -46,13 +44,13 @@ volid_test license++_static license_generator_snippet - ${Boost_test_LIBRARY} + ${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) -ADD_TEST(volid_test ${EXECUTABLE_OUTPUT_PATH}/volid_test) +ADD_TEST(NAME standard_license_test COMMAND standard_license_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) +ADD_TEST(NAME date_test COMMAND date_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) +ADD_TEST(NAME volid_test COMMAND volid_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -- Gitblit v1.9.1