diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-23 22:42:12 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-23 22:42:12 +0000 |
| commit | 40bd056979327608e919754e9fec1e68950be800 (patch) | |
| tree | dfcb8cfe3af66c313768cd88247a80e6e71c9745 | |
| parent | ef563f1728d4b5e72e65e43e0e461ad28595054f (diff) | |
| download | tdebase-40bd056979327608e919754e9fec1e68950be800.tar.gz tdebase-40bd056979327608e919754e9fec1e68950be800.zip | |
Fix kdebase conditional builds
Thanks to Fat-Zer for the patch!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1260420 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | kdmlib/CMakeLists.txt | 14 |
2 files changed, 14 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d7be8426b..3c7f75bbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,6 +124,9 @@ option( BUILD_KSYSTRAYCMD "Build ksystraycmd" ${BUILD_ALL} ) option( BUILD_NSPLUGINS "Build nsplugins" ${BUILD_ALL} ) option( BUILD_KSYSGUARD "Build ksysguard" ${BUILD_ALL} ) option( BUILD_KXKB "Build kxkb" ${BUILD_ALL} ) +option( BUILD_TSAK "Build tsak" ${BUILD_ALL} ) +option( BUILD_KROOTBACKING "Build krootbacking" ${BUILD_ALL} ) +option( BUILD_TQT3INTEGRATION "Build tqt3integration" ${BUILD_ALL} ) ##### set PKG_CONFIG_PATH ####################### @@ -194,9 +197,9 @@ tde_conditional_add_subdirectory( BUILD_KSYSTRAYCMD ksystraycmd ) tde_conditional_add_subdirectory( BUILD_NSPLUGINS nsplugins ) tde_conditional_add_subdirectory( BUILD_KSYSGUARD ksysguard ) tde_conditional_add_subdirectory( BUILD_KXKB kxkb ) -add_subdirectory( tsak ) -add_subdirectory( krootbacking ) -add_subdirectory( tqt3integration ) +tde_conditional_add_subdirectory( BUILD_TSAK tsak ) +tde_conditional_add_subdirectory( BUILD_KROOTBACKING krootbacking ) +tde_conditional_add_subdirectory( BUILD_TQT3INTEGRATION tqt3integration ) ##### install startkde & related stuff ########## diff --git a/kdmlib/CMakeLists.txt b/kdmlib/CMakeLists.txt index d15d427e1..f3e8d708e 100644 --- a/kdmlib/CMakeLists.txt +++ b/kdmlib/CMakeLists.txt @@ -73,9 +73,11 @@ endif( ) ##### kompmgr (executable) ####################### -tde_add_executable( kdmtsak - SOURCES kdmtsak.cpp - LINK ${TQT_LIBRARIES} - DESTINATION ${BIN_INSTALL_DIR} - SETUID -)
\ No newline at end of file +if( BUILD_TSAK ) + tde_add_executable( kdmtsak + SOURCES kdmtsak.cpp + LINK ${TQT_LIBRARIES} + DESTINATION ${BIN_INSTALL_DIR} + SETUID + ) +endif( BUILD_TSAK ) |