diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2013-06-30 01:25:43 +0400 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-23 02:22:27 +0100 |
| commit | 20d7a1094395321bcbd105eb7fe471ece3d59888 (patch) | |
| tree | 1ce5c2995bfd3b941987369c678dc94d2a89fc16 /CMakeLists.txt | |
| parent | f2208fe7d1d51c4bbbd73f74d075a538b6b189f5 (diff) | |
| download | tdelibs-20d7a1094395321bcbd105eb7fe471ece3d59888.tar.gz tdelibs-20d7a1094395321bcbd105eb7fe471ece3d59888.zip | |
Add new build option WITH_XRANDR
This resolves Bug 1553
(cherry picked from commit 4626871a9d3778ff1423e8a5405def70ee8a4fba)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c735bc335..5563e0c09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,6 +84,7 @@ OPTION( WITH_INOTIFY "Enable inotify support for kio" ON ) OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} ) OPTION( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF ) OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} ) +OPTION( WITH_XRANDR "Build the krandr library" ON ) OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} ) OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} ) @@ -575,10 +576,14 @@ endif( NOT FONTCONFIG_FOUND ) ##### check for Xrandr ########################## -pkg_search_module( XRANDR xrandr>=1.2 ) -if( XRANDR_FOUND ) - set( XRANDR_SUPPORT 1 ) -endif( XRANDR_FOUND ) +if( WITH_XRANDR ) + pkg_search_module( XRANDR xrandr>=1.2 ) + if( XRANDR_FOUND ) + set( XRANDR_SUPPORT 1 ) + else( XRANDR_FOUND ) + tde_message_fatal( "xrandr support was required, but not found on your system" ) + endif( XRANDR_FOUND ) +endif( WITH_XRANDR ) ##### check for xrender ######################### @@ -909,9 +914,7 @@ add_subdirectory( arts ) add_subdirectory( interfaces ) add_subdirectory( kate ) add_subdirectory( kcert ) -if( XRANDR_FOUND ) - add_subdirectory( krandr ) -endif( XRANDR_FOUND ) +tde_conditional_add_subdirectory( WITH_XRANDR krandr ) add_subdirectory( khtml ) add_subdirectory( kcmshell ) add_subdirectory( kconf_update ) |