From 51d2a91984383c8c1a0caba632cd2e3f26547114 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 16 Apr 2011 21:01:53 +0000 Subject: [PATCH] Fix dbus tqt check git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpowersave@1228275 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ConfigureChecks.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 1ce4bfc..a971c48 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -49,22 +49,22 @@ find_package( TQt ) find_package( TDE ) -# check for dbus-1 pkg_search_module( DBUS dbus-1 ) if( NOT DBUS_FOUND ) - tde_message_fatal( "dbus-1 are required, but not found on your system" ) + tde_message_fatal( "dbus-1 is required, but was not found on your system" ) endif( ) -# check for dbus-qt3 (version 0.7) +# check for dbus-tqt tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) -set( CMAKE_REQUIRED_INCLUDES ${QT_INCLUDE_DIRS} ${DBUS_INCLUDE_DIRS} ) +set( CMAKE_REQUIRED_INCLUDES ${QT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${DBUS_INCLUDE_DIRS} ) set( CMAKE_REQUIRED_LIBRARIES ${TQT_LDFLAGS} ) check_cxx_source_compiles(" + #include #include int main(int, char**) { return 0; } " HAVE_DBUS_QT3_07 ) tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) if( NOT HAVE_DBUS_QT3_07 ) - tde_message_fatal( "dbus-qt3 (version 0.7) are required, but not found on your system" ) + tde_message_fatal( "dbus-tqt is required, but was not found on your system" ) endif( )