From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 14 Jan 2014 17:59:18 +0000 (+0100)
Subject: Include test-dbus and test-bus in cmake 'make check' target.
X-Git-Tag: dbus-1.9.2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ad6a5575f5a904359e2331c711f94265d767e68;p=thirdparty%2Fdbus.git

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 628a681a9..32250f59d 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 a373458ab..5e81e7f9a 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-.*
-)