From ff475b1d93cd4f30a8779b4f2a29539bcae6de35 Mon Sep 17 00:00:00 2001
From: Jan Willamowius <jan@willamowius.de>
Date: 周日, 21 4月 2019 23:19:00 +0800
Subject: [PATCH] Merge pull request #1 from open-license-manager/master
---
test/functional/CMakeLists.txt | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/test/functional/CMakeLists.txt b/test/functional/CMakeLists.txt
index 79c2b2a..0fc9432 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
@@ -15,32 +16,41 @@
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)
+#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(date_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