From 3c34d8d6d83a34e3bcdb7041be1cbd784a17bbb5 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 30 11月 2019 14:56:39 +0800
Subject: [PATCH] Merge branch 'feature/issue_licenses_42' of https://github.com/open-license-manager/open-license-manager.git into feature/issue_licenses_42
---
test/functional/CMakeLists.txt | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/test/functional/CMakeLists.txt b/test/functional/CMakeLists.txt
index 926af63..8143ef5 100644
--- a/test/functional/CMakeLists.txt
+++ b/test/functional/CMakeLists.txt
@@ -1,52 +1,65 @@
ADD_LIBRARY(license_generator_snippet STATIC
generate-license.cpp
)
+
target_link_libraries(
license_generator_snippet
license_generator_lib
)
add_executable(
- standard_license_test
+ test_standard_license
standard-license_test.cpp
)
target_link_libraries(
- standard_license_test
- license++_static
+ test_standard_license
+ licensecc_static
license_generator_snippet
+ ${Boost_LIBRARIES}
)
-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
+ test_date
date_test.cpp
)
target_link_libraries(
- date_test
- license++_static
+ test_date
+ licensecc_static
license_generator_snippet
+ ${Boost_LIBRARIES}
)
-SET_TARGET_PROPERTIES(date_test PROPERTIES LINK_SEARCH_START_STATIC ON)
-add_dependencies( date_test boost_test boost_filesystem )
add_executable(
- volid_test
+ test_signature_verifier
+ signature_verifier_test.cpp
+)
+
+target_link_libraries(
+ test_signature_verifier
+ licensecc_static
+ license_generator_snippet
+ ${Boost_LIBRARIES}
+)
+
+
+add_executable(
+ test_volid
volid_test.cpp
)
target_link_libraries(
- volid_test
- license++_static
+ test_volid
+ licensecc_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)
-ADD_TEST(volid_test ${EXECUTABLE_OUTPUT_PATH}/volid_test)
+ADD_TEST(NAME test_date COMMAND test_date WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ADD_TEST(NAME test_standard_license COMMAND test_standard_license WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ADD_TEST(NAME test_signature_verifier COMMAND test_signature_verifier WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ADD_TEST(NAME test_volid COMMAND test_volid WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+
--
Gitblit v1.9.1