diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2012-12-14 01:37:24 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-12-14 01:54:12 +0100 |
| commit | 1cce4b75f1a85e7bbcc0f1482114f120a0fe4309 (patch) | |
| tree | 77650e62e6c6acf77d865f2ee6d955ab96d74b69 /ConfigureChecks.cmake | |
| parent | 155aa5df866fbafa56081b88faa02646a6aba7d9 (diff) | |
| download | tdebase-1cce4b75f1a85e7bbcc0f1482114f120a0fe4309.tar.gz tdebase-1cce4b75f1a85e7bbcc0f1482114f120a0fe4309.zip | |
Fix cmake build: FTBFS on kioslaves with hal
(cherry picked from commit fb6d447fcc46ebd5f1b8f333d76f2cb90d73c93b)
Diffstat (limited to 'ConfigureChecks.cmake')
| -rw-r--r-- | ConfigureChecks.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 3834f6d57..8dc8a3fbb 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -233,7 +233,6 @@ find_package( TQt ) find_package( TDE ) -# dbus-tqt need Qt flags # dbus (kdm, ksmserver) if( BUILD_KDM OR BUILD_KSMSERVER ) @@ -242,6 +241,11 @@ if( BUILD_KDM OR BUILD_KSMSERVER ) tde_message_fatal( "dbus-1 is required, but was not found on your system" ) endif( ) +endif( ) + + +# dbus-tqt (kdm, ksmserver, kioslaves(media)) +if( BUILD_KDM OR BUILD_KSMSERVER OR (BUILD_KIOSLAVES AND WITH_HAL) ) # check for dbus-tqt pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt ) tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) |