From dda16735b94661b798d6c0fd3e41af944de0a1fe Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 13 10月 2019 15:02:19 +0800
Subject: [PATCH] refactoring - locators

---
 test/library/CMakeLists.txt |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index 44e8c80..c59615f 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -2,17 +2,19 @@
  license_reader_test
  LicenseReader_test.cpp
 )
-#add_dependencies( license_reader_test boost_filesystem )
 
 target_link_libraries(
  license_reader_test
- license++_static
+ licensecc_static
  ${Boost_LIBRARIES}
 )
 
-#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( ( 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
@@ -27,11 +29,26 @@
  		os
  		${Boost_LIBRARIES}
 	)
-	
-	#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)   
-	
+
+	ADD_TEST(NAME os_linux_test COMMAND os_linux_test)
 ENDIF(WIN32)
 
-install(TARGETS license_reader_test RUNTIME DESTINATION bin)
+
+### LicenseLocator tests
+add_executable(
+ license_locator_test
+ LicenseLocator_test.cpp
+)
+
+target_link_libraries(
+ license_locator_test
+ locators
+ ${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

--
Gitblit v1.9.1