From a26bd812ef3fd21dd3d68bd10704ae3dd8eeea6b Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 10 11月 2019 22:25:22 +0800
Subject: [PATCH] improvements for issue #42
---
test/functional/CMakeLists.txt | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/test/functional/CMakeLists.txt b/test/functional/CMakeLists.txt
index 242e77b..0dd0a42 100644
--- a/test/functional/CMakeLists.txt
+++ b/test/functional/CMakeLists.txt
@@ -8,51 +8,51 @@
)
add_executable(
- standard_license_test
+ test_standard_license
standard-license_test.cpp
)
target_link_libraries(
- standard_license_test
- license++_static
+ test_standard_license
+ licensecc_static
license_generator_snippet
- ${Boost_filesystem_LIBRARY}
- ${Boost_test_LIBRARY}
+ ${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
+ test_date
date_test.cpp
)
target_link_libraries(
- date_test
- license++_static
+ test_date
+ licensecc_static
license_generator_snippet
- ${Boost_filesystem_LIBRARY}
- ${Boost_test_LIBRARY}
+ ${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
+ test_volid
volid_test.cpp
)
target_link_libraries(
- volid_test
- license++_static
+ test_volid
+ licensecc_static
license_generator_snippet
- ${Boost_test_LIBRARY}
+ ${Boost_LIBRARIES}
)
-#SET_TARGET_PROPERTIES(volid_test PROPERTIES LINK_SEARCH_START_STATIC ON)
-#add_dependencies( volid_test boost_test boost_filesystem )
+#set CROSSCOMPILING_EMULATOR
+IF( ( CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") AND CMAKE_CROSSCOMPILING)
+#binfmt_misc doesn't work in my system :(
+ ADD_TEST(NAME test_standard_license COMMAND wine ${CMAKE_CURRENT_BINARY_DIR}/test_standard_license WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ ADD_TEST(NAME test_date COMMAND wine ${CMAKE_CURRENT_BINARY_DIR}/test_date WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ ADD_TEST(NAME test_volid COMMAND wine ${CMAKE_CURRENT_BINARY_DIR}/test_volid WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ELSE()
+ ADD_TEST(NAME test_standard_license COMMAND test_standard_license WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ ADD_TEST(NAME test_date COMMAND test_date WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ ADD_TEST(NAME test_volid COMMAND test_volid WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ENDIF()
-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