diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2014-01-14 18:59:18 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2014-10-24 18:49:44 +0200 |
| commit | 8ad6a5575f5a904359e2331c711f94265d767e68 (patch) | |
| tree | 91f4c576dae0fff668e9641d878cf4fb2644248a /cmake | |
| parent | 3d363220ad9e16f00faa1c6cdd4913507c3e4c1a (diff) | |
| download | dbus-8ad6a5575f5a904359e2331c711f94265d767e68.tar.gz | |
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cmake/test/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 628a681a..32250f59 100644 --- 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 a373458a..5e81e7f9 100644 --- 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-.* -) |