From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周四, 29 5月 2025 18:14:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop

---
 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