diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-11 13:55:17 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-11 13:55:17 +0200 |
| commit | cc15d245adb2552b3c7fe766560bae725868c907 (patch) | |
| tree | 06c2e07e757b6d5ef556b10922d7c236f3fdb7b3 /tests/CMakeLists.txt | |
| parent | a2aac2de9402709a0eeea16fb893d261a61624e6 (diff) | |
| parent | 887b5f92bdd6485a4da521086ec88e63357d2260 (diff) | |
| download | ayatana-indicator-session-cc15d245adb2552b3c7fe766560bae725868c907.tar.gz ayatana-indicator-session-cc15d245adb2552b3c7fe766560bae725868c907.tar.bz2 ayatana-indicator-session-cc15d245adb2552b3c7fe766560bae725868c907.zip | |
Merge branch 'tari01-pr/cmake-extras-tests-coverage'
Attribute GH PR #41: https://github.com/AyatanaIndicators/ayatana-indicator-session/pull/41
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4bd5a8a..1e81bc2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,10 +1,12 @@ +find_package(GMock) + +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-pie") + # build the necessary schemas set_directory_properties (PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES gschemas.compiled) set_source_files_properties (gschemas.compiled GENERATED) -SET(COVERAGE_TEST_TARGETS "") - # GSettings: # compile the schemas our tests use (ayatana-indicator-session's, lockdown, media-keys) # into a gschemas.compiled file in this directory, and help the tests to find @@ -33,7 +35,7 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR} ${SERVICE_INCLUDE_DIRS}) # backendmock add_library (backendmock STATIC - backend-mock-actions.c + backend-mock-actions.c backend-mock-actions.h backend-mock.c backend-mock.h @@ -41,7 +43,6 @@ add_library (backendmock STATIC backend-mock-guest.h backend-mock-users.c backend-mock-users.h) -set_target_properties (backendmock PROPERTIES COMPILE_FLAGS " ${CC_WARNING_ARGS} -g") add_custom_target( gschemas-compiled ALL DEPENDS gschemas.compiled @@ -50,11 +51,9 @@ add_custom_target( # test-service add_executable (test-service test-service.cc) -set_target_properties (test-service PROPERTIES COMPILE_FLAGS " ${CC_WARNING_ARGS} -std=c++0x -g") +set_target_properties (test-service PROPERTIES COMPILE_FLAGS " -std=c++0x") add_test (test-service test-service) add_dependencies (test-service libayatanaindicatorsessionservice backendmock gschemas-compiled) -target_link_libraries (test-service libayatanaindicatorsessionservice backendmock gtest ${SERVICE_LIBRARIES} ${GTEST_LIBS}) - -SET(COVERAGE_TEST_TARGETS "${COVERAGE_TEST_TARGETS} test-service") +target_link_libraries (test-service libayatanaindicatorsessionservice backendmock ${SERVICE_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES}) add_subdirectory (backend-dbus) |