summaryrefslogtreecommitdiffstats
path: root/ConfigureChecks.cmake
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-02-04 02:46:39 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-02-04 02:46:39 +0100
commit1f3832a1368de214e95a38dd391367f8ae2456cb (patch)
treeac2c0e68c7a1393b124528054bd11df69e32381b /ConfigureChecks.cmake
parent6275375b6aa17c6da78ab6486a8c930e9fd595f5 (diff)
downloadtdebase-1f3832a1368de214e95a38dd391367f8ae2456cb.tar.gz
tdebase-1f3832a1368de214e95a38dd391367f8ae2456cb.zip
Removed unnecessary dependency on dbus-tqt and dbus-1-tqt
Diffstat (limited to 'ConfigureChecks.cmake')
-rw-r--r--ConfigureChecks.cmake14
1 files changed, 4 insertions, 10 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index ce20b392b..6a1d1a457 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -269,8 +269,8 @@ find_package( TDE )
-# dbus (tdm, ksmserver)
-if( BUILD_TDM OR BUILD_KSMSERVER )
+# dbus (tdm)
+if( BUILD_TDM )
pkg_search_module( DBUS dbus-1 )
if( NOT DBUS_FOUND )
@@ -280,15 +280,9 @@ if( BUILD_TDM OR BUILD_KSMSERVER )
endif( )
-# dbus-tqt (tdm, ksmserver, tdeioslaves(media))
-if( BUILD_TDM OR BUILD_KSMSERVER OR BUILD_KICKER OR (BUILD_TDEIOSLAVES AND WITH_HAL) )
+# dbus-tqt (ksmserver, kicker, tdeioslaves(media))
+if( WITH_HAL AND (BUILD_KSMSERVER OR BUILD_KICKER OR BUILD_TDEIOSLAVES) )
- if( BUILD_KSMSERVER AND WITH_UPOWER )
- pkg_check_modules( DBUS_1_TQT dbus-1-tqt )
- if( NOT DBUS_1_TQT_FOUND )
- tde_message_fatal( "dbus-tqt-1 is required, but was not found on your system" )
- endif( )
- endif( )
# check for dbus-tqt
# dbus-tqt need Qt flags
pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )