From 8faa8c86e08092c15d250a6f18a58ccbb27f68f2 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 01 9月 2019 18:50:18 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/open-license-manager/open-license-manager.git
---
test/library/CMakeLists.txt | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index 3e7ee93..314aa6f 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -2,19 +2,21 @@
license_reader_test
LicenseReader_test.cpp
)
+#add_dependencies( license_reader_test boost_filesystem )
target_link_libraries(
license_reader_test
license++_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)
+#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(NAME license_reader_test COMMAND license_reader_test)
-#IF(WIN32)
+IF(WIN32)
#test windows
-#ELSE(WIN32)
+ELSE(WIN32)
add_executable(
os_linux_test
Os_Linux_test.cpp
@@ -23,10 +25,11 @@
target_link_libraries(
os_linux_test
os
+ ${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)
+ #add_dependencies( os_linux_test )
+ #SET_TARGET_PROPERTIES(os_linux_test PROPERTIES LINK_SEARCH_START_STATIC ON)
+ ADD_TEST(NAME os_linux_test COMMAND os_linux_test)
-#ENDIF(WIN32)
\ No newline at end of file
+ENDIF(WIN32)
--
Gitblit v1.9.1