From 483c73630a82fe8fbe9fe74cc8bbdd23a13d8b6b Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 15 2月 2020 23:49:50 +0800 Subject: [PATCH] pc identifiers work --- test/library/CMakeLists.txt | 70 ++++++++++++----------------------- 1 files changed, 24 insertions(+), 46 deletions(-) diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt index d10f25d..45bd810 100644 --- a/test/library/CMakeLists.txt +++ b/test/library/CMakeLists.txt @@ -1,20 +1,13 @@ -add_executable( - test_license_reader +add_executable( test_license_reader LicenseReader_test.cpp ) -target_link_libraries( - test_license_reader +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() IF(WIN32) #test windows @@ -26,32 +19,28 @@ 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( - test_license_locator - LicenseLocator_test.cpp + test_license_locator + LicenseLocator_test.cpp ) 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() ### LicenseLocator tests add_executable( @@ -61,26 +50,15 @@ target_link_libraries( test_event_registry - base - ${Boost_LIBRARIES} + licensecc_static + 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_license_reader COMMAND test_license_reader) +ADD_TEST(NAME test_license_locator COMMAND test_license_locator) +ADD_TEST(NAME test_event_registry COMMAND test_event_registry) -### 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_SUBDIRECTORY(os) +ADD_SUBDIRECTORY(hw_identifier) \ No newline at end of file -- Gitblit v1.9.1