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 | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/test/functional/CMakeLists.txt b/test/functional/CMakeLists.txt
index 4e3773d..a3d70ec 100644
--- a/test/functional/CMakeLists.txt
+++ b/test/functional/CMakeLists.txt
@@ -1,3 +1,11 @@
+ADD_LIBRARY(license_generator_snippet STATIC
+ generate-license.cpp
+)
+
+target_link_libraries(
+ license_generator_snippet
+ license_generator_lib
+)
add_executable(
standard_license_test
@@ -7,8 +15,42 @@
target_link_libraries(
standard_license_test
license++_static
- license_generator_lib
+ license_generator_snippet
+ ${Boost_LIBRARIES}
+)
+#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
)
-SET_TARGET_PROPERTIES(standard_license_test PROPERTIES LINK_SEARCH_START_STATIC ON)
+target_link_libraries(
+ date_test
+ license++_static
+ license_generator_snippet
+ ${Boost_LIBRARIES}
+)
+#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)
+#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)
+
--
Gitblit v1.9.1