aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorRodney Dawes <rodney.dawes@canonical.com>2017-02-02 17:14:30 -0500
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-08-29 14:38:27 +0200
commitd4f59920e8ab7fb33b92ccda6c5ca4ea20b06080 (patch)
tree70dc9606ac9006155f9a68f7fededa2187d8b6c2 /CMakeLists.txt
parent6122733b1584e2e80a64ffb04e35c796fe588f6f (diff)
downloadayatana-indicator-datetime-d4f59920e8ab7fb33b92ccda6c5ca4ea20b06080.tar.gz
ayatana-indicator-datetime-d4f59920e8ab7fb33b92ccda6c5ca4ea20b06080.tar.bz2
ayatana-indicator-datetime-d4f59920e8ab7fb33b92ccda6c5ca4ea20b06080.zip
Also need PARENT_SCOPE here.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt39
1 files changed, 22 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb98d9a..6b46ee2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,28 +118,33 @@ endif()
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
include_directories (${CMAKE_CURRENT_BINARY_DIR}/include)
-# testing & coverage
-if (${ENABLE_TESTS})
- pkg_check_modules (DBUSTEST REQUIRED dbustest-1>=14.04.0)
- enable_testing ()
- if (${ENABLE_COVERAGE})
- find_package(CoverageReport)
- ENABLE_COVERAGE_REPORT(
- TARGETS indicatordatetimeservice ayatana-indicator-datetime-service
- TESTS ${COVERAGE_TEST_TARGETS}
- FILTER /usr/include ${CMAKE_BINARY_DIR}/*
- )
- endif ()
-endif ()
-
# actually build things
add_subdirectory(include)
add_subdirectory(src)
add_subdirectory(data)
add_subdirectory(po)
-if (${ENABLE_TESTS})
- add_subdirectory(tests)
-endif ()
+
+# testing & coverage
+if (ENABLE_TESTS)
+
+ include(CTest)
+ pkg_check_modules (DBUSTEST REQUIRED dbustest-1>=14.04.0)
+ enable_testing ()
+ enable_testing()
+ add_subdirectory(tests)
+
+ if (ENABLE_COVERAGE)
+
+ find_package(CoverageReport)
+ ENABLE_COVERAGE_REPORT(
+ TARGETS indicatordatetimeservice ayatana-indicator-datetime-service
+ TESTS ${COVERAGE_TEST_TARGETS}
+ FILTER /usr/include ${CMAKE_BINARY_DIR}/*
+ )
+
+ endif()
+
+endif()
# Display config info