From ccc1c260f197c1823e8806f6750b96ee8175d4e7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 26 Jul 2013 19:44:40 +0200 Subject: [PATCH] qdbusxml2cpp is only found if QtDBus is explicity "found" --- CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35909aafa..331514adf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,6 +117,9 @@ if( NOT BUILD_WITH_QT4 ) find_package(Qt5Widgets QUIET) message(STATUS "Found Qt5! Be aware that Qt5-support is still experimental and not officially supported!") + # We need this to find the paths to qdbusxml2cpp and co + find_package(Qt5DBus REQUIRED) + macro(qt_wrap_ui) qt5_wrap_ui(${ARGN}) endmacro() @@ -351,10 +354,10 @@ ADD_SUBDIRECTORY( thirdparty ) ADD_SUBDIRECTORY( src ) ADD_SUBDIRECTORY( admin ) -if( BUILD_TESTS ) - enable_testing() - add_subdirectory( tests ) -endif() +#if( BUILD_TESTS ) +# enable_testing() +# add_subdirectory( tests ) +#endif() # Add all targets to the build-tree export set