From d28496ae196434d78dccde2a61585f9de0e42453 Mon Sep 17 00:00:00 2001 From: Gabriele Contini <contini.mailing@gmail.com> Date: 周日, 01 12月 2019 20:24:04 +0800 Subject: [PATCH] mingw cross compile add openssl --- test/library/CMakeLists.txt | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt index b7f4d90..382dcb5 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 @@ -33,7 +28,6 @@ ADD_TEST(NAME test_os_linux COMMAND test_os_linux) ENDIF(WIN32) - ### LicenseLocator tests add_executable( test_license_locator @@ -46,12 +40,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_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,8 +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() \ No newline at end of file +ADD_TEST(NAME test_event_registry COMMAND test_event_registry) -- Gitblit v1.9.1