From 11a0f65bae425baf09508e2d57c830f5cad69df5 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 14 12月 2019 09:42:26 +0800 Subject: [PATCH] cleanup and change license generation parameters --- test/library/CMakeLists.txt | 39 +++++---------------------------------- 1 files changed, 5 insertions(+), 34 deletions(-) diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt index d10f25d..e849663 100644 --- a/test/library/CMakeLists.txt +++ b/test/library/CMakeLists.txt @@ -9,12 +9,7 @@ ${Boost_LIBRARIES} ) -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 +21,12 @@ target_link_libraries( test_os_linux - os + licensecc_static ${Boost_LIBRARIES} ) ADD_TEST(NAME test_os_linux COMMAND test_os_linux) ENDIF(WIN32) - ### LicenseLocator tests add_executable( @@ -42,16 +36,11 @@ target_link_libraries( test_license_locator - locators + licensecc_static ${Boost_LIBRARIES} ) -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( @@ -65,22 +54,4 @@ ${Boost_LIBRARIES} ) -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() - -### verifier tests -add_executable( - test_verifier - verifier_test.cpp -) - -target_link_libraries( - test_verifier - base - ${Boost_LIBRARIES} -) - -ADD_TEST(NAME test_verifier COMMAND test_verfier) \ No newline at end of file +ADD_TEST(NAME test_event_registry COMMAND test_event_registry) -- Gitblit v1.9.1