From 497745ad31c90545b288e2845049e0ce474bcbe2 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 19 10月 2019 10:10:45 +0800
Subject: [PATCH] Merge branch 'feature/code_review_and_refactor' into develop
---
test/library/CMakeLists.txt | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index 49edff0..b7f4d90 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -1,34 +1,72 @@
add_executable(
- license_reader_test
+ test_license_reader
LicenseReader_test.cpp
)
target_link_libraries(
- license_reader_test
- licensepp_static
+ test_license_reader
+ 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 license_reader_test COMMAND wine ${CMAKE_CURRENT_BINARY_DIR}/license_reader_test)
+ ADD_TEST(NAME test_license_reader COMMAND wine ${CMAKE_CURRENT_BINARY_DIR}/test_license_reader)
ELSE()
- ADD_TEST(NAME license_reader_test COMMAND license_reader_test)
+ ADD_TEST(NAME test_license_reader COMMAND test_license_reader)
ENDIF()
IF(WIN32)
#test windows
ELSE(WIN32)
add_executable(
- os_linux_test
+ test_os_linux
Os_Linux_test.cpp
)
target_link_libraries(
- os_linux_test
+ test_os_linux
os
${Boost_LIBRARIES}
)
- ADD_TEST(NAME os_linux_test COMMAND os_linux_test)
+ ADD_TEST(NAME test_os_linux COMMAND test_os_linux)
ENDIF(WIN32)
+
+
+### LicenseLocator tests
+add_executable(
+ test_license_locator
+ LicenseLocator_test.cpp
+)
+
+target_link_libraries(
+ test_license_locator
+ locators
+ ${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()
+
+### LicenseLocator tests
+add_executable(
+ test_event_registry
+ EventRegistry_test.cpp
+)
+
+target_link_libraries(
+ test_event_registry
+ base
+ ${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
--
Gitblit v1.9.1