From ec839e6965064291f91ab3b884dc7fa1fab7b52c Mon Sep 17 00:00:00 2001 From: Gabriele Contini <contini.mailing@gmail.com> Date: 周六, 14 12月 2019 22:12:21 +0800 Subject: [PATCH] add centos 8 --- test/library/CMakeLists.txt | 41 +++++++++++++++++------------------------ 1 files changed, 17 insertions(+), 24 deletions(-) diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt index dfb681a..c04985d 100644 --- a/test/library/CMakeLists.txt +++ b/test/library/CMakeLists.txt @@ -6,15 +6,12 @@ target_link_libraries( test_license_reader licensecc_static - ${Boost_LIBRARIES} + Boost::unit_test_framework + Boost::filesystem + Boost::system ) -IF( ( CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") AND CMAKE_CROSSCOMPILING) -#binfmt_misc doesn't work in my system :( - ADD_TEST(NAME test_license_reader COMMAND wine ${CMAKE_CURRENT_BINARY_DIR}/test_license_reader) -ELSE() - ADD_TEST(NAME test_license_reader COMMAND test_license_reader) -ENDIF() +ADD_TEST(NAME test_license_reader COMMAND test_license_reader) IF(WIN32) #test windows @@ -26,13 +23,14 @@ target_link_libraries( test_os_linux - os - ${Boost_LIBRARIES} + licensecc_static + Boost::unit_test_framework + Boost::filesystem + Boost::system ) ADD_TEST(NAME test_os_linux COMMAND test_os_linux) ENDIF(WIN32) - ### LicenseLocator tests add_executable( @@ -42,16 +40,13 @@ target_link_libraries( test_license_locator - locators - ${Boost_LIBRARIES} + licensecc_static + Boost::unit_test_framework + Boost::filesystem + Boost::system ) -IF( ( CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") AND CMAKE_CROSSCOMPILING) -#binfmt_misc doesn't work in my system :( - ADD_TEST(NAME test_license_locator COMMAND wine ${CMAKE_CURRENT_BINARY_DIR}/test_license_locator) -ELSE() - ADD_TEST(NAME test_license_locator COMMAND test_license_locator) -ENDIF() +ADD_TEST(NAME test_license_locator COMMAND test_license_locator) ### LicenseLocator tests add_executable( @@ -62,11 +57,9 @@ target_link_libraries( test_event_registry base - ${Boost_LIBRARIES} + Boost::unit_test_framework + Boost::filesystem + Boost::system ) -IF( ( CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") AND CMAKE_CROSSCOMPILING) - ADD_TEST(NAME test_event_registry COMMAND wine ${CMAKE_CURRENT_BINARY_DIR}/test_event_registry) -ELSE() - ADD_TEST(NAME test_event_registry COMMAND test_event_registry) -ENDIF() +ADD_TEST(NAME test_event_registry COMMAND test_event_registry) -- Gitblit v1.9.1