make desktops/minicli/panels optional

Author: llunak

CMakeLists.txt

@@ -2,6 +2,10 @@ cmake_minimum_required( VERSION 2.6 )
 
 project( kor )
 
+option( KOR_DESKTOPS "Build Kor support for desktop background" ON )
+option( KOR_MINICLI "Build Kor support for mini command line" ON )
+option( KOR_PANELS "Build Kor support for panels" ON )
+
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
 
 find_package( KDE4 REQUIRED )
@@ -25,51 +29,74 @@ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
 
 include_directories(
     ${CMAKE_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/desktop
-    ${CMAKE_SOURCE_DIR}/minicli
-    ${CMAKE_SOURCE_DIR}/panels
     ${CMAKE_SOURCE_DIR}/utils
     ${CMAKE_BINARY_DIR}
     )
 
+if(KOR_DESKTOPS)
+include_directories( ${CMAKE_SOURCE_DIR}/desktop )
+endif(KOR_DESKTOPS)
+
+if(KOR_MINICLI)
+include_directories( ${CMAKE_SOURCE_DIR}/minicli )
+endif(KOR_MINICLI)
+
+if(KOR_PANELS)
+include_directories( ${CMAKE_SOURCE_DIR}/panels )
+endif(KOR_PANELS)
+
 ########### next target ###############
 
 set( kor_SRCS
      main.cpp
      application.cpp
      startupsuspendhandler.cpp
+     )
+
+if(KOR_DESKTOPS)
+set( kor_SRCS ${kor_SRCS}
      desktop/desktop.cpp
      desktop/plasmawallpaper.cpp
      desktop/wallpaper.cpp
+     utils/x11utils.cpp
+     )
+endif(KOR_PANELS)
+
+if(KOR_MINICLI)
+set( kor_SRCS ${kor_SRCS}
      minicli/minicli.cpp
      minicli/miniclidialog.cpp
      minicli/miniclihandler.cpp
+     )
+kde4_add_ui_files( kor_SRCS
+    minicli/miniclidialog.ui
+    )
+set( kor_KCFGC_FILES ${kor_KCFGC_FILES}
+     minicli/minicliconfig.kcfgc
+     minicli/miniclidialogconfig.kcfgc
+     )
+endif(KOR_MINICLI)
+
+if(KOR_PANELS)
+set( kor_SRCS ${kor_SRCS}
      panels/applet.cpp
      panels/panel.cpp
      panels/spacer.cpp
      panels/clock/clock.cpp
      panels/hello/hello.cpp
      panels/plasma/plasmaapplet.cpp
-     utils/x11utils.cpp
      )
-
 if(HAVE_NETROOTINFO2_CURRENTDESKTOPFORSCREEN)
 set( kor_SRCS ${kor_SRCS}
      panels/desktopsonscreens/desktopsonscreens.cpp
      )
 endif(HAVE_NETROOTINFO2_CURRENTDESKTOPFORSCREEN)
-
-kde4_add_ui_files( kor_SRCS
-    minicli/miniclidialog.ui
-    )
-
-set( kor_KCFGC_FILES
-     minicli/minicliconfig.kcfgc
-     minicli/miniclidialogconfig.kcfgc
+set( kor_KCFGC_FILES ${kor_KCFGC_FILES}
      panels/clock/clockconfig.kcfgc
      panels/hello/helloconfig.kcfgc
      panels/plasma/plasmaappletconfig.kcfgc
      )
+endif(KOR_PANELS)
 
 kde4_add_kcfg_files( kor_SRCS ${kor_KCFGC_FILES} )
 foreach( kcfgc ${kor_KCFGC_FILES} )
@@ -100,6 +127,7 @@ install( FILES korrc DESTINATION ${CONFIG_INSTALL_DIR} )
 
 ########### next target ###############
 
+if(KOR_PANELS)
 kde4_add_plugin(plasma_containment_korinternal panels/plasma/plasmacontainment.cpp)
 if( KDE4_PLASMA_LIBS )
     target_link_libraries(plasma_containment_korinternal ${KDE4_PLASMA_LIBS})
@@ -109,3 +137,4 @@ endif( KDE4_PLASMA_LIBS )
 
 install(TARGETS plasma_containment_korinternal DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES panels/plasma/plasma-containment-korinternal.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+endif(KOR_PANELS)

application.cpp

@@ -15,24 +15,40 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
+#include <config.h>
+
 #include "application.h"
 
+#ifdef KOR_DESKTOPS
 #include "desktop.h"
+#endif
+#ifdef KOR_MINICLI
 #include "minicli.h"
+#endif
+#ifdef KOR_PANELS
 #include "panel.h"
+#endif
+
+#include <kconfiggroup.h>
 
 namespace Kor
 {
 
 Application::Application()
     {
     KConfigGroup cfg( KGlobal::config(), "Layout" );
+#ifdef KOR_MINICLI
     if( cfg.readEntry( "Minicli", true ))
         objects.append( new Minicli( this ));
+#endif
+#ifdef KOR_PANELS
     foreach( const QString& panelid, cfg.readEntry( "Panels", QStringList()))
         objects.append( new Panel( panelid, this ));
+#endif
+#ifdef KOR_DESKTOPS
     foreach( const QString& desktopid, cfg.readEntry( "Desktops", QStringList()))
         objects.append( new Desktop( desktopid, this ));
+#endif
     setQuitOnLastWindowClosed( false );
     }
 

application.h

@@ -21,8 +21,6 @@
 #include <kuniqueapplication.h>
 #include <qscopedpointer.h>
 
-#include "minicli.h"
-
 namespace Kor
 {
 

config.h.cmake

@@ -1 +1,4 @@
 #cmakedefine HAVE_NETROOTINFO2_CURRENTDESKTOPFORSCREEN 1
+#cmakedefine KOR_DESKTOPS 1
+#cmakedefine KOR_MINICLI 1
+#cmakedefine KOR_PANELS 1