From a0b74b09a5824d50613e3b3a5590e7a9ed515716 Mon Sep 17 00:00:00 2001
From: Wenfeng CAI <xoxyzox-m@yahoo.com>
Date: 周二, 13 11月 2018 10:51:36 +0800
Subject: [PATCH] Fix assumed return type of MSVC
---
test/library/CMakeLists.txt | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index d4067c2..314aa6f 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -1,9 +1,8 @@
-link_directories ( ${Boost_LIBRARY_DIRS} )
-
add_executable(
license_reader_test
LicenseReader_test.cpp
)
+#add_dependencies( license_reader_test boost_filesystem )
target_link_libraries(
license_reader_test
@@ -11,8 +10,9 @@
${Boost_LIBRARIES}
)
-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)
#test windows
@@ -27,7 +27,9 @@
os
${Boost_LIBRARIES}
)
-
- 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_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)
--
Gitblit v1.9.1