From e3e83c70085d9a9c82b643b46d918fe3a2d21e03 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 14 12月 2019 11:35:52 +0800
Subject: [PATCH] fix windows compilation, better cmake output

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

diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index 3e7ee93..e849663 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -1,32 +1,57 @@
 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}
 )
 
-add_dependencies( license_reader_test boost_test boost_filesystem )
-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)
+IF(WIN32)
 #test windows
-#ELSE(WIN32)
+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_dependencies( os_linux_test boost_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_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