diff options
| author | Timothy Pearson <[email protected]> | 2012-02-15 00:05:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-02-15 00:05:42 -0600 |
| commit | 0a95f048637129360015e2f4300204ef4a858bff (patch) | |
| tree | ea539a123deb9d6d268c16a69b8352a9196e1119 /CMakeLists.txt | |
| parent | 989d6a19014011bd6981abb3decb91a7b3af0971 (diff) | |
| parent | 525c0e8bac637315df3f89ae84a9118ba27f0c0e (diff) | |
| download | tdebase-0a95f048637129360015e2f4300204ef4a858bff.tar.gz tdebase-0a95f048637129360015e2f4300204ef4a858bff.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 093626569..0385c2b00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ ################################################# # -# (C) 2010-2011 Serghei Amelian +# (C) 2010-2012 Serghei Amelian # serghei (DOT) amelian (AT) gmail.com # # Improvements and feedback are welcome @@ -15,7 +15,7 @@ cmake_minimum_required( VERSION 2.8 ) project( tdebase ) set( PACKAGE tdebase ) -set( VERSION "3.5.13" ) +set( VERSION "R14" ) ##### include essential cmake modules ########### @@ -77,12 +77,14 @@ option( WITH_XINERAMA "Enable xinerama extension support" ${WITH_ALL_OPTIONS} ) option( WITH_ARTS "Enable aRts support" ${WITH_ALL_OPTIONS} ) option( WITH_I8K "Enable Dell laptop support (ksysguard)" ${WITH_ALL_OPTIONS} ) option( WITH_HAL "Enable HAL support" ${WITH_ALL_OPTIONS} ) +option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} ) option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) ##### user requested modules #################### option( BUILD_ALL "Build all" OFF ) +option( BUILD_TDEINIT "Build tdeinit" ${BUILD_ALL} ) option( BUILD_L10N "Build l10n" ${BUILD_ALL} ) option( BUILD_PICS "Build pics" ${BUILD_ALL} ) option( BUILD_APPLNK "Build applnk" ${BUILD_ALL} ) @@ -157,8 +159,8 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) ##### tdebase directories ####################### add_subdirectory( tdmlib ) -add_subdirectory( tdeinit ) +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 ) @@ -204,7 +206,7 @@ tde_conditional_add_subdirectory( BUILD_KSYSGUARD ksysguard ) tde_conditional_add_subdirectory( BUILD_KXKB kxkb ) tde_conditional_add_subdirectory( BUILD_TSAK tsak ) tde_conditional_add_subdirectory( BUILD_KROOTBACKING krootbacking ) -tde_conditional_add_subdirectory( BUILD_TQT3INTEGRATION tqt3integration ) +tde_conditional_add_subdirectory( BUILD_TQT3INTEGRATION tqt3integration ) ##### install starttde & related stuff ########## |