From d4f59920e8ab7fb33b92ccda6c5ca4ea20b06080 Mon Sep 17 00:00:00 2001
From: Rodney Dawes <rodney.dawes@canonical.com>
Date: Thu, 2 Feb 2017 17:14:30 -0500
Subject: Also need PARENT_SCOPE here.

---
 CMakeLists.txt | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

(limited to 'CMakeLists.txt')

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
 
-- 
cgit v1.2.3