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/functional/CMakeLists.txt | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/test/functional/CMakeLists.txt b/test/functional/CMakeLists.txt
index 86296ab..a3d70ec 100644
--- a/test/functional/CMakeLists.txt
+++ b/test/functional/CMakeLists.txt
@@ -1,6 +1,7 @@
ADD_LIBRARY(license_generator_snippet STATIC
generate-license.cpp
)
+
target_link_libraries(
license_generator_snippet
license_generator_lib
@@ -15,46 +16,41 @@
standard_license_test
license++_static
license_generator_snippet
+ ${Boost_LIBRARIES}
)
-SET_TARGET_PROPERTIES(standard_license_test PROPERTIES LINK_SEARCH_START_STATIC ON)
+#SET_TARGET_PROPERTIES(standard_license_test PROPERTIES LINK_SEARCH_START_STATIC ON)
+#add_dependencies( standard_license_test boost_test boost_filesystem )
add_executable(
date_test
date_test.cpp
)
+
target_link_libraries(
date_test
license++_static
license_generator_snippet
+ ${Boost_LIBRARIES}
)
-SET_TARGET_PROPERTIES(date_test PROPERTIES LINK_SEARCH_START_STATIC ON)
+#SET_TARGET_PROPERTIES(date_test PROPERTIES LINK_SEARCH_START_STATIC ON)
+#add_dependencies( date_test boost_test boost_filesystem )
add_executable(
volid_test
volid_test.cpp
)
+
target_link_libraries(
volid_test
license++_static
license_generator_snippet
+ ${Boost_LIBRARIES}
)
-SET_TARGET_PROPERTIES(volid_test PROPERTIES LINK_SEARCH_START_STATIC ON)
+#SET_TARGET_PROPERTIES(volid_test PROPERTIES LINK_SEARCH_START_STATIC ON)
+#add_dependencies( volid_test boost_test boost_filesystem )
ADD_TEST(standard_license_test ${EXECUTABLE_OUTPUT_PATH}/standard_license_test)
ADD_TEST(date_test ${EXECUTABLE_OUTPUT_PATH}/date_test)
ADD_TEST(volid_test ${EXECUTABLE_OUTPUT_PATH}/volid_test)
-
-
-add_executable(
- stackoverflow
- stackoverflow.cpp
-)
-
-target_link_libraries(
- stackoverflow
- license_generator_lib
-)
-
-SET_TARGET_PROPERTIES(stackoverflow PROPERTIES LINK_SEARCH_START_STATIC ON)
\ No newline at end of file
--
Gitblit v1.9.1