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

diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index c59615f..e849663 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -1,54 +1,57 @@
 add_executable(
- license_reader_test
+ test_license_reader
  LicenseReader_test.cpp
 )
 
 target_link_libraries(
- license_reader_test
+ test_license_reader
  licensecc_static
  ${Boost_LIBRARIES}
 )
 
-IF( ( CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") AND CMAKE_CROSSCOMPILING)
-#binfmt_misc doesn't work in my system :(
-	ADD_TEST(NAME license_reader_test COMMAND wine ${CMAKE_CURRENT_BINARY_DIR}/license_reader_test)
-ELSE()
-	ADD_TEST(NAME license_reader_test COMMAND license_reader_test)
-ENDIF()
+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}
 	)
 
-	ADD_TEST(NAME os_linux_test COMMAND os_linux_test)
+	ADD_TEST(NAME test_os_linux COMMAND test_os_linux)
 ENDIF(WIN32)
-
 
 ### LicenseLocator tests
 add_executable(
- license_locator_test
+ test_license_locator
  LicenseLocator_test.cpp
 )
 
 target_link_libraries(
- license_locator_test
- locators
+ test_license_locator
+ licensecc_static
  ${Boost_LIBRARIES}
 )
 
-IF( ( CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") AND CMAKE_CROSSCOMPILING)
-#binfmt_misc doesn't work in my system :(
-	ADD_TEST(NAME license_locator_test COMMAND wine ${CMAKE_CURRENT_BINARY_DIR}/license_locator_test)
-ELSE()
-	ADD_TEST(NAME license_locator_test COMMAND license_locator_test)
-ENDIF()
\ No newline at end of file
+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