From 11a0f65bae425baf09508e2d57c830f5cad69df5 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 14 12月 2019 09:42:26 +0800
Subject: [PATCH] cleanup and change license generation parameters

---
 test/library/CMakeLists.txt |   50 +++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index d4067c2..e849663 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -1,33 +1,57 @@
-link_directories ( ${Boost_LIBRARY_DIRS} )
-
 add_executable(
- license_reader_test
+ test_license_reader
  LicenseReader_test.cpp
 )
 
 target_link_libraries(
- license_reader_test
- license++_static
+ test_license_reader
+ licensecc_static
  ${Boost_LIBRARIES}
 )
 
-SET_TARGET_PROPERTIES(license_reader_test PROPERTIES LINK_SEARCH_START_STATIC ON)
-ADD_TEST(license_reader_test ${EXECUTABLE_OUTPUT_PATH}/license_reader_test)
+ADD_TEST(NAME test_license_reader COMMAND test_license_reader)
 
 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
+ 		test_os_linux
+ 		licensecc_static
  		${Boost_LIBRARIES}
 	)
 
-	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_LIBRARIES}
+)
+
+ADD_TEST(NAME test_license_locator COMMAND test_license_locator)
+
+### LicenseLocator tests
+add_executable(
+ test_event_registry
+ EventRegistry_test.cpp
+)
+
+target_link_libraries(
+ test_event_registry
+ base
+ ${Boost_LIBRARIES}
+)
+
+ADD_TEST(NAME test_event_registry COMMAND test_event_registry)

--
Gitblit v1.9.1