From 36ce07093b68b07513149577c209ae7a57ab356b Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 15 3月 2020 16:26:21 +0800
Subject: [PATCH] Merge branch 'feature/pc_identifiers' into develop issues #2 #3 #14 #49
---
test/library/CMakeLists.txt | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index c04985d..ab9d134 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -1,24 +1,20 @@
-add_executable(
- test_license_reader
+add_executable( test_license_reader
LicenseReader_test.cpp
)
-target_link_libraries(
- test_license_reader
+target_link_libraries( test_license_reader
licensecc_static
Boost::unit_test_framework
Boost::filesystem
Boost::system
)
-ADD_TEST(NAME test_license_reader COMMAND test_license_reader)
-
IF(WIN32)
#test windows
ELSE(WIN32)
add_executable(
test_os_linux
- Os_Linux_test.cpp
+ os_linux_test.cpp
)
target_link_libraries(
@@ -34,8 +30,8 @@
### LicenseLocator tests
add_executable(
- test_license_locator
- LicenseLocator_test.cpp
+ test_license_locator
+ LicenseLocator_test.cpp
)
target_link_libraries(
@@ -46,20 +42,26 @@
Boost::system
)
-ADD_TEST(NAME test_license_locator COMMAND test_license_locator)
-
### LicenseLocator tests
add_executable(
test_event_registry
EventRegistry_test.cpp
+ $<TARGET_OBJECTS:base>
)
target_link_libraries(
test_event_registry
- base
Boost::unit_test_framework
- Boost::filesystem
Boost::system
)
+if(CODE_COVERAGE AND UNIX)
+ target_link_libraries(test_event_registry gcov)
+endif(CODE_COVERAGE AND UNIX)
+
+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