Merge branch 'master' of https://github.com/open-license-manager/open-licen...

open-license-manager

2014-09-08 897303206e87db7616b8c5f11b894c94b1047e7c

 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,9 +16,10 @@
 standard_license_test
 license++_static
 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 )
#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
@@ -28,9 +30,10 @@
 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 )
#SET_TARGET_PROPERTIES(date_test PROPERTIES LINK_SEARCH_START_STATIC ON)
#add_dependencies( date_test boost_test boost_filesystem )

add_executable(
 volid_test
@@ -41,10 +44,11 @@
 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 )
#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)