summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2014-04-06 10:09:39 +0400
committerSlávek Banko <slavek.banko@axis.cz>2014-04-29 01:49:30 +0200
commit63dd66d0459abfa98d6e6eeec40fa4efd285a074 (patch)
tree0051e6aec87ec477d3b47a5142ec61d555e8375d
parent3c75381e05b6443906527f2c2513455309578ea8 (diff)
downloadtdebase-63dd66d0.tar.gz
tdebase-63dd66d0.zip
Move the XRandr test to main ConfigureChecks.cmake
-rw-r--r--ConfigureChecks.cmake9
-rw-r--r--kcontrol/ConfigureChecks.cmake10
2 files changed, 9 insertions, 10 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index bd37b3477..757916aa5 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -83,6 +83,15 @@ if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_K
endif( )
+# xrender (kcontrol, twin)
+if( WITH_XRANDR )
+ pkg_search_module( XRANDR xrandr )
+ if( NOT XRANDR_FOUND )
+ tde_message_fatal( "xrandr are requested, but not found on your system" )
+ endif( )
+endif( )
+
+
# xcursor (tdeioslave, kcontrol)
if( WITH_XCURSOR )
pkg_search_module( XCURSOR xcursor )
diff --git a/kcontrol/ConfigureChecks.cmake b/kcontrol/ConfigureChecks.cmake
index 1ff4f0635..9676dbab3 100644
--- a/kcontrol/ConfigureChecks.cmake
+++ b/kcontrol/ConfigureChecks.cmake
@@ -45,16 +45,6 @@ else( )
endif( )
-##### check for Xrandr ##########################
-
-if( WITH_XRANDR )
- pkg_search_module( XRANDR xrandr )
- if( NOT XRANDR_FOUND )
- tde_message_fatal( "xrandr are requested, but not found on your system" )
- endif( )
-endif( )
-
-
##### check for libusb ##########################
if( WITH_LIBUSB )