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 |   76 +++++++++++++++++++++++++++-----------
 1 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index fc1ec78..ab9d134 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -1,35 +1,67 @@
-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
- 		Os_Linux_test.cpp
+ 		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)   
-	
-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_OBJECTS:base>
+)
+
+target_link_libraries(
+ test_event_registry
+ Boost::unit_test_framework 
+ 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