diff options
| author | gregory guy <[email protected]> | 2018-09-21 14:45:51 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2018-09-22 15:39:08 +0200 |
| commit | e0f071e72365e82ded55143fc68db759d12b8357 (patch) | |
| tree | e659763f9e83e42a5c49a15c0bc57093de310f36 | |
| parent | 5725a6f6fafdd525d0ed9963f7a553886ed69c80 (diff) | |
| download | kiosktool-e0f071e72365e82ded55143fc68db759d12b8357.tar.gz kiosktool-e0f071e72365e82ded55143fc68db759d12b8357.zip | |
add an option to build kcm-autostart, set by 'OFF' as default
Signed-off-by: gregory guy <[email protected]>
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit e208e9cac8f7b10e2a92468bd42027aef68c0ffb)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kiosktool/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | kiosktool/kcms/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kiosktool/kcms/autostart/CMakeLists.txt | 13 |
4 files changed, 21 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 15f077d..739d036 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,8 @@ option( BUILD_ALL "Build all" ON ) option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) +option( BUILD_KCM_AUTOSTART "Build kcm autostart" OFF ) + ##### configure checks diff --git a/kiosktool/CMakeLists.txt b/kiosktool/CMakeLists.txt index 3ac1c09..c8bf8ea 100644 --- a/kiosktool/CMakeLists.txt +++ b/kiosktool/CMakeLists.txt @@ -1,5 +1,3 @@ -add_subdirectory( kcms ) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} @@ -91,3 +89,8 @@ install( FILES kiosktool.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) + + +###### kcm modules + +add_subdirectory( kcms ) diff --git a/kiosktool/kcms/CMakeLists.txt b/kiosktool/kcms/CMakeLists.txt index 4d25def..21a11a0 100644 --- a/kiosktool/kcms/CMakeLists.txt +++ b/kiosktool/kcms/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory( autostart ) +tde_conditional_add_subdirectory( BUILD_KCM_AUTOSTART autostart ) diff --git a/kiosktool/kcms/autostart/CMakeLists.txt b/kiosktool/kcms/autostart/CMakeLists.txt index 722a583..505dfaf 100644 --- a/kiosktool/kcms/autostart/CMakeLists.txt +++ b/kiosktool/kcms/autostart/CMakeLists.txt @@ -12,6 +12,19 @@ link_directories( ) +##### warning of possible collision + +message( AUTHOR_WARNING + " \n" + " ---------------------------------------------------------- \n" + " *** NOTE *** \n" + " The build of kcm autostart module is not recommended \n" + " because there is also a separate kcm-autostart application \n" + " with which the module would be in collision. \n" + " ---------------------------------------------------------- \n" +) + + ##### kcm_autostart (kpart) tde_add_kpart( kcm_autostart AUTOMOC |