From 4467a957a498b93dbcaefbad97df24b43dfbc99d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 08 3月 2020 22:16:09 +0800
Subject: [PATCH] fix tests
---
test/library/CMakeLists.txt | 69 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index 44e8c80..45bd810 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -1,37 +1,64 @@
-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_LIBRARIES}
+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_LIBRARIES}
+ 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)
-
+
+ ADD_TEST(NAME test_os_linux COMMAND test_os_linux)
ENDIF(WIN32)
-install(TARGETS license_reader_test RUNTIME DESTINATION bin)
+### 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)
+
+ADD_SUBDIRECTORY(os)
+ADD_SUBDIRECTORY(hw_identifier)
\ No newline at end of file
--
Gitblit v1.9.1