Merge lp:~jpakkane/dbus-cpp/depfix into lp:dbus-cpp

[Jussi Pakkanen]

Error out if dependencies are not found.

Error out if dependencies are not found.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:5
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-raring-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-raring-armhf-ci/7/console
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-raring-armhf-ci/7/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-raring-i386-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dbus-cpp-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[Dimitri John Ledkov (xnox)]

is this going to land?

Unmerged revisions

5. By Jussi Pakkanen on 2013-05-23

Break with an error immediately if dependencies are not found.

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-05-21 09:49:21 +0000
+++ tests/CMakeLists.txt	2013-05-23 09:09:29 +0000
@@ -20,11 +20,11 @@
 add_subdirectory(/usr/src/gtest gtest)
 set (CMAKE_CXX_FLAGS ${OLD_CMAKE_CXX_FLAGS})
 
-find_package(PkgConfig)
-find_package(Boost COMPONENTS system)
-find_package(Threads)
+find_package(PkgConfig REQUIRED)
+find_package(Boost COMPONENTS system REQUIRED)
+find_package(Threads REQUIRED)
 
-pkg_check_modules(DBUS dbus-1)
+pkg_check_modules(DBUS dbus-1 REQUIRED)
 
 option(
     DBUS_CPP_ENABLE_DBUS_TEST_RUNNER 
@@ -34,6 +34,9 @@
 
 if (DBUS_CPP_ENABLE_DBUS_TEST_RUNNER)
     find_program(DBUS_TEST_RUNNER_EXECUTABLE dbus-test-runner)
+    if(NOT DBUS_TEST_RUNNER_EXECUTABLE)
+      message(FATAL_ERROR "Could not find dbus-test-runner executable.")
+    endif()
     message(STATUS "Executing test suite under dbus-test-runner")
 endif (DBUS_CPP_ENABLE_DBUS_TEST_RUNNER)