Include test-dbus and test-bus in cmake 'make check' target.

Because test-dbus and test-bus lives in subdirectory dbus/bus, we need
to define make 'check' in top level source directory.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73689
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 628a681a98f96fbdca0edafd6a434aca17208c72..32250f59d60c1575c07e5f3148db66427d57ef2d 100644 (file)
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -496,6 +496,9 @@ add_subdirectory( dbus )
 add_subdirectory( bus )
 if (DBUS_BUILD_TESTS)
        add_subdirectory( test )
+       add_custom_target(check
+               COMMAND ctest -R ^test-.*
+       )
 endif (DBUS_BUILD_TESTS)
 add_subdirectory( tools )
 add_subdirectory( doc )

diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index a373458abc194baf7cb0e97a4257c72ed0757349..5e81e7f9a3430fb10cf99e69314f75e29982146f 100644 (file)
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -172,7 +172,3 @@ FOREACH(FILE ${FILES})
         MESSAGE("FROM: ${FILE}\nTO: ${TARGET}\n")
     ENDIF (CONFIG_VERBOSE)
 ENDFOREACH(FILE)
-
-add_custom_target(check
-    COMMAND ctest -R ^test-.*
-)