From f70b62c23fc0818c1e84b297cf4f3917b95b9d14 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 30 11月 2019 19:16:45 +0800 Subject: [PATCH] try wine64 for mingw build --- test/library/CMakeLists.txt | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt index 78ad9ad..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,9 +40,18 @@ ${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() \ No newline at end of file +ADD_TEST(NAME test_license_locator COMMAND test_license_locator) + +### LicenseLocator tests +add_executable( + test_event_registry + EventRegistry_test.cpp +) + +target_link_libraries( + test_event_registry + base + ${Boost_LIBRARIES} +) + +ADD_TEST(NAME test_event_registry COMMAND test_event_registry) -- Gitblit v1.9.1