diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2013-06-30 01:25:43 +0400 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-25 16:11:42 +0200 |
| commit | 4626871a9d3778ff1423e8a5405def70ee8a4fba (patch) | |
| tree | 5c2b1faf77b297e395c423e160fd2600ba8ebf81 | |
| parent | 645e8c58a752ed221388d916b1981483cc6d8811 (diff) | |
| download | tdelibs-4626871a9d3778ff1423e8a5405def70ee8a4fba.tar.gz tdelibs-4626871a9d3778ff1423e8a5405def70ee8a4fba.zip | |
Add new build option WITH_XRANDR
This resolves Bug 1553
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 722dddf43..487d9faaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,6 +95,7 @@ OPTION( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OPTION( WITH_OLD_XDG_STD "Use the pre R14.0.0 XDG standard where both TDE and KDE are recognized in desktop files" OFF ) OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} ) OPTION( WITH_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF ) +OPTION( WITH_XRANDR "Build the tderandr library" ON ) OPTION( WITH_KDE4_MENU_SUFFIX "Add [KDE4] tag to KDE4 menu items" OFF ) OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} ) @@ -599,10 +600,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 ######################### @@ -1025,9 +1030,7 @@ add_subdirectory( arts ) add_subdirectory( interfaces ) add_subdirectory( kate ) add_subdirectory( tdecert ) -if( XRANDR_FOUND ) - add_subdirectory( tderandr ) -endif( XRANDR_FOUND ) +tde_conditional_add_subdirectory( WITH_XRANDR tderandr ) add_subdirectory( tdehtml ) add_subdirectory( tdecmshell ) add_subdirectory( tdeconf_update ) |