From a1b64080d1525a7a65e53f33d1a3fd257957e732 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 15 3月 2020 11:00:39 +0800
Subject: [PATCH] fix compilation errors

---
 test/library/CMakeLists.txt |   71 +++++++++++++++++++++--------------
 1 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index c59615f..8e1946f 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -1,54 +1,67 @@
-add_executable(
- license_reader_test
+add_executable( test_license_reader
  LicenseReader_test.cpp
 )
 
-target_link_libraries(
- license_reader_test
+target_link_libraries( test_license_reader
  licensecc_static
- ${Boost_LIBRARIES}
+ Boost::unit_test_framework 
+ Boost::filesystem
+ Boost::system
 )
-
-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()
 
 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
- 		${Boost_LIBRARIES}
+ 		test_os_linux
+ 		licensecc_static
+ 		Boost::unit_test_framework 
+        Boost::filesystem
+        Boost::system
 	)
 
-	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
- LicenseLocator_test.cpp
+	test_license_locator
+ 	LicenseLocator_test.cpp
 )
 
 target_link_libraries(
- license_locator_test
- locators
- ${Boost_LIBRARIES}
+ test_license_locator
+ licensecc_static
+ Boost::unit_test_framework 
+ Boost::filesystem
+ Boost::system
 )
 
-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
+### LicenseLocator tests
+add_executable(
+ test_event_registry
+ EventRegistry_test.cpp
+)
+
+target_link_libraries(
+ test_event_registry
+ base
+ 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