diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7ab1d23c..fd4f5102b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,12 @@ # ################################################# -cmake_minimum_required( VERSION 3.5 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### @@ -23,6 +28,7 @@ set( PACKAGE tdebase ) ##### include essential cmake modules ########### include( FindPkgConfig ) +include( FindThreads ) include( CheckIncludeFile ) include( CheckIncludeFiles ) include( CheckCSourceRuns ) @@ -40,11 +46,6 @@ include( CheckTypeSize ) include( TDEMacros ) -##### set version number ######################## - -tde_set_project_version( ) - - ##### setup install paths ####################### include( TDESetupPaths ) @@ -53,14 +54,8 @@ tde_setup_paths( ) ##### add apidox targets ############ -if( "${CMAKE_VERSION}" VERSION_LESS "3.1" ) - set( CMAKE_ENV "env" ) -else() - set( CMAKE_ENV "${CMAKE_COMMAND};-E;env" ) -endif() - add_custom_target( apidox - COMMAND ${CMAKE_ENV} + COMMAND ${CMAKE_COMMAND} -E env "TQTDOCDIR=/usr/share/tqt3/doc/html" "DOXDATA=${HTML_INSTALL_DIR}/en/common" ${CMAKE_SOURCE_DIR}/admin/doxygen.sh @@ -105,7 +100,7 @@ option( WITH_XFIXES "Enable xfixes support" ${WITH_ALL_OPTIONS} ) option( WITH_XRANDR "Enable xrandr support" ${WITH_ALL_OPTIONS} ) option( WITH_XRENDER "Enable xrender support" ${WITH_ALL_OPTIONS} ) option( WITH_LIBCONFIG "Enable libconfig support" ${WITH_ALL_OPTIONS} ) -option( WITH_PCRE "Enable pcre regex support" ON ) +option( WITH_PCRE2 "Enable pcre2 regex support" ON ) option( WITH_XTEST "Enable xtest support" ${WITH_ALL_OPTIONS} ) option( WITH_OPENGL "Enable openGL support" ${WITH_ALL_OPTIONS} ) option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} ) @@ -125,6 +120,7 @@ option( WITH_TDEHWLIB "Enable TDE hardware library support" ${WITH_ALL_OPTIONS} option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} ) option( WITH_ELFICON "Enable ELF embedded metadata support" ${WITH_ALL_OPTIONS} ) option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) +option( WITH_XKB_TRANSLATIONS "Use translations for xkb messages provided by xkeyboard-config" ON ) ##### options comments ########################## @@ -157,10 +153,11 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" # WITH_PAM affects tdm kdesktop kcheckpass # WITH_SHADOW affects tdm kcheckpass # WITH_UPOWER affects ksmserver -# WITH_LIBCONFIG affects twin/compot-tde -# WITH_PCRE affects twin/compot-tde +# WITH_LIBCONFIG affects twin/compton-tde +# WITH_PCRE2 affects twin/compton-tde # WITH_SUDO_TDESU_BACKEND affects tdesu # WITH_SUDO_KONSOLE_SUPER_USER_COMMAND affects launching Konsole super user sessions +# WITH_XKB_TRANSLATIONS affects kxkb # NOTE: WITH_SHADOW and WITH_PAM shouldn't be set concurrently # WITH_PAM will override WITH_SHADOW @@ -257,7 +254,7 @@ tde_conditional_add_subdirectory( BUILD_TDEINIT tdeinit ) tde_conditional_add_subdirectory( BUILD_L10N l10n ) tde_conditional_add_subdirectory( BUILD_PICS pics ) tde_conditional_add_subdirectory( BUILD_APPLNK applnk ) -tde_conditional_add_project_docs( BUILD_DOC ) +tde_conditional_add_subdirectory( BUILD_DOC doc ) tde_conditional_add_subdirectory( BUILD_LIBKONQ libkonq ) tde_conditional_add_subdirectory( BUILD_KCMINIT kcminit ) tde_conditional_add_subdirectory( BUILD_TWIN twin ) |