From d35591346c48606697898338c1c01a3d52c520eb Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周三, 01 1月 2020 20:23:54 +0800
Subject: [PATCH] update build system and cleanup
---
test/library/CMakeLists.txt | 69 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index a88aae1..056ed89 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -1,36 +1,61 @@
-add_executable(
- license_reader_test
+add_executable( test_license_reader
LicenseReader_test.cpp
)
-#add_dependencies( license_reader_test boost_filesystem )
-target_link_libraries(
- license_reader_test
- license++_static
- boost_filesystem
- boost_test
+target_link_libraries( test_license_reader
+ licensecc_static
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
)
-
-#SET_TARGET_PROPERTIES(license_reader_test PROPERTIES LINK_SEARCH_START_STATIC ON)
-#SET_TARGET_PROPERTIES(license_reader_test PROPERTIES LINK_SEARCH_END_STATIC OFF)
-ADD_TEST(license_reader_test ${EXECUTABLE_OUTPUT_PATH}/license_reader_test)
IF(WIN32)
#test windows
ELSE(WIN32)
add_executable(
- os_linux_test
+ test_os_linux
Os_Linux_test.cpp
)
target_link_libraries(
- os_linux_test
- os
- ${Boost_test_LIBRARY}
+ test_os_linux
+ licensecc_static
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
)
-
- #add_dependencies( os_linux_test )
- #SET_TARGET_PROPERTIES(os_linux_test PROPERTIES LINK_SEARCH_START_STATIC ON)
- ADD_TEST(os_linux_test ${EXECUTABLE_OUTPUT_PATH}/os_linux_test)
-
-ENDIF(WIN32)
\ No newline at end of file
+
+ ADD_TEST(NAME test_os_linux COMMAND test_os_linux)
+ENDIF(WIN32)
+
+### LicenseLocator tests
+add_executable(
+ test_license_locator
+ LicenseLocator_test.cpp
+)
+
+target_link_libraries(
+ test_license_locator
+ licensecc_static
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
+)
+
+### LicenseLocator tests
+add_executable(
+ test_event_registry
+ EventRegistry_test.cpp
+)
+
+target_link_libraries(
+ test_event_registry
+ licensecc_static
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
+)
+
+ADD_TEST(NAME test_license_reader COMMAND test_license_reader)
+ADD_TEST(NAME test_license_locator COMMAND test_license_locator)
+ADD_TEST(NAME test_event_registry COMMAND test_event_registry)
--
Gitblit v1.9.1