From 897303206e87db7616b8c5f11b894c94b1047e7c Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周一, 08 9月 2014 05:59:02 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/open-license-manager/open-license-manager.git
---
test/library/CMakeLists.txt | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index c8c638c..fc1ec78 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,5 +10,26 @@
${Boost_LIBRARIES}
)
-SET_TARGET_PROPERTIES(license_reader_test PROPERTIES LINK_SEARCH_START_STATIC ON)
-ADD_TEST(license_reader_test ${EXECUTABLE_OUTPUT_PATH}/LicenseReader_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(license_reader_test ${EXECUTABLE_OUTPUT_PATH}/license_reader_test)
+
+IF(WIN32)
+#test windows
+ELSE(WIN32)
+ add_executable(
+ os_linux_test
+ Os_Linux_test.cpp
+ )
+
+ target_link_libraries(
+ os_linux_test
+ 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)
+
+ENDIF(WIN32)
\ No newline at end of file
--
Gitblit v1.9.1