From 39c1afd3f898e9577981edf624e96d46777fb07e Mon Sep 17 00:00:00 2001
From: Serghei Amelian <serghei.amelian@gmail.com>
Date: Tue, 14 Feb 2012 20:51:02 +0200
Subject: [tdebase/cmake] added BUILD_TDEINIT option

---
 CMakeLists.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 093626569..c10f65055 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 ###########
@@ -83,6 +83,7 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
 ##### 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 +158,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 )
-- 
cgit v1.2.1


From b5236f1d75d5784aa9f1dac7e826921e7c464b6b Mon Sep 17 00:00:00 2001
From: Serghei Amelian <serghei.amelian@gmail.com>
Date: Wed, 15 Feb 2012 02:36:12 +0200
Subject: [tdebase/ksmserver] added UPower support

---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c10f65055..0385c2b00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,6 +77,7 @@ 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} )
 
 
@@ -205,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 ##########
 
-- 
cgit v1.2.1