From 5186bd8997132a1332a637a8e25b62cb065caf18 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 14 Jan 2014 18:59:18 +0100 Subject: [PATCH 1/2] 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. --- cmake/CMakeLists.txt | 3 +++ cmake/test/CMakeLists.txt | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 628a681..32250f5 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 13f639b..fb3b31e 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -169,7 +169,3 @@ FOREACH(FILE ${FILES}) MESSAGE("FROM: ${FILE}\nTO: ${TARGET}\n") ENDIF (CONFIG_VERBOSE) ENDFOREACH(FILE) - -add_custom_target(check - COMMAND ctest -R ^test-.* -) -- 1.8.4.5