diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2014-04-07 00:10:55 +0400 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-04-29 01:51:47 +0200 |
| commit | 394545c24c0e31d84ccb3d008c8da7c2e1f06451 (patch) | |
| tree | 0fe738e30697871f9c3749de1641747aad2c8df8 /ConfigureChecks.cmake | |
| parent | 63dd66d0459abfa98d6e6eeec40fa4efd285a074 (diff) | |
| download | tdebase-394545c24c0e31d84ccb3d008c8da7c2e1f06451.tar.gz tdebase-394545c24c0e31d84ccb3d008c8da7c2e1f06451.zip | |
twin/compton-tde: transparent pass TDE build-time configure options to compot-tde
Diffstat (limited to 'ConfigureChecks.cmake')
| -rw-r--r-- | ConfigureChecks.cmake | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 757916aa5..34aff70fb 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -83,7 +83,7 @@ if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_K endif( ) -# xrender (kcontrol, twin) +# xrandr (kcontrol) if( WITH_XRANDR ) pkg_search_module( XRANDR xrandr ) if( NOT XRANDR_FOUND ) @@ -144,7 +144,8 @@ if( WITH_LIBCONFIG ) pkg_search_module( LIBCONFIG libconfig ) if( LIBCONFIG_FOUND ) set( HAVE_LIBCONFIG 1 ) - if( LIBCONFIG_VERSION VERSION_LESS 1.5.0 ) + # TODO replace with functionality check + if( LIBCONFIG_VERSION VERSION_LESS 1.4.0 ) set( HAVE_LIBCONFIG_OLD_API 1 ) endif( ) else( LIBCONFIG_FOUND ) @@ -153,6 +154,15 @@ if( WITH_LIBCONFIG ) endif( ) +# pcre (twin/compton-tde) +if( WITH_PCRE ) + pkg_search_module( LIBPCRE libpcre ) + if( NOT LIBPCRE_FOUND ) + tde_message_fatal( "pcre support is requested, but not found on your system" ) + endif( NOT LIBPCRE_FOUND ) +endif( ) + + # xtest (kxkb) if( WITH_XTEST ) pkg_search_module( XTEST xtst ) @@ -196,7 +206,7 @@ if( WITH_XSCREENSAVER ) endif( ) -# openGL (kdesktop or kcontrol or tdescreensaver ) +# openGL (kdesktop or kcontrol or tdescreensaver or twin/compot-tde ) if( WITH_OPENGL ) pkg_search_module( GL gl ) if( GL_FOUND ) @@ -297,8 +307,8 @@ find_package( TDE ) -# dbus (tdm, kdesktop) -if( BUILD_TDM OR BUILD_KDESKTOP ) +# dbus (tdm, kdesktop, twin/compton-tde.c) +if( BUILD_TDM OR BUILD_KDESKTOP OR (BUILD_TWIN AND WITH_XCOMPOSITE) ) pkg_search_module( DBUS dbus-1 ) if( NOT DBUS_FOUND ) |