From kde-commits  Mon Dec 06 17:07:59 2010
From: Marc Mutz <mutz () kde ! org>
Date: Mon, 06 Dec 2010 17:07:59 +0000
To: kde-commits
Subject: KDE/kdepim/kleopatra
Message-Id: <20101206170759.B28CCAC8AA () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129165533032753

SVN commit 1204301 by mutz:

Kleopatra: optionally (KLEO_STATIC_KCMODULES) compile kcm_kleopatra into kleopatra proper

Enabled by default on WINCE (I hope).
Requires latest work/komo/kdelibs if the option KLEO_STATIC_KCMODULES is set

 M  +8 -0      CMakeLists.txt  
 M  +6 -0      conf/CMakeLists.txt  
 M  +33 -5     conf/configuredialog.cpp  
 M  +3 -0      config-kleopatra.h.cmake  


--- trunk/KDE/kdepim/kleopatra/CMakeLists.txt #1204300:1204301
@@ -1,5 +1,7 @@
 project(kleopatra)
 
+option( KLEO_STATIC_KCMODULES "Build Kleopatra's KCMs into Kleopatra; don't install plugins" WINCE )
+
 include(MacroOptionalAddSubdirectory)
 
 set( kleopatra_version 2.1.0 )
@@ -302,6 +304,12 @@
   )
 endif(WINCE)
 
+if ( KLEO_STATIC_KCMODULES )
+  set(_kleopatra_extra_libs kcm_kleopatra)
+else ( KLEO_STATIC_KCMODULES )
+  set(_kleopatra_extra_libs)
+endif ( KLEO_STATIC_KCMODULES )
+
 if ( KLEO_MODEL_TEST )
  add_definitions( -DKLEO_MODEL_TEST )
  set( _kleopatra_SRCS ${_kleopatra_SRCS} models/modeltest.cpp )
--- trunk/KDE/kdepim/kleopatra/conf/CMakeLists.txt #1204300:1204301
@@ -64,12 +64,18 @@
   ${CMAKE_SOURCE_DIR}/kleopatra/kcfg/emailoperationspreferences.kcfgc
   )
 
+if ( KLEO_STATIC_KCMODULES )
+kde4_add_plugin(kcm_kleopatra STATIC ${kcm_kleopatra_PART_SRCS})
+else ( KLEO_STATIC_KCMODULES )
 kde4_add_plugin(kcm_kleopatra ${kcm_kleopatra_PART_SRCS})
+endif ( KLEO_STATIC_KCMODULES )
 
 target_link_libraries(kcm_kleopatra ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS} kleo ${_kcm_kleopatra_extra_libs} ${_kcm_kleopatra_libkleopatraclient_extra_LIBS})
 
 
+if ( NOT KLEO_STATIC_KCMODULES )
 install(TARGETS kcm_kleopatra  DESTINATION ${PLUGIN_INSTALL_DIR})
+endif ( NOT KLEO_STATIC_KCMODULES )
 
 
 ########### install files ###############
--- trunk/KDE/kdepim/kleopatra/conf/configuredialog.cpp #1204300:1204301
@@ -45,6 +45,27 @@
 #include <QApplication>
 #include <QIcon>
 
+#ifdef KLEO_STATIC_KCMODULES
+# include <KDesktopFile>
+# define KCM_IMPORT_PLUGIN( x ) extern "C" KCModule * create_##x( QWidget * parent=0, const QVariantList & args=QVariantList() );
+# define addMyModule( x ) addModule( KCModuleInfo( KDesktopFile( "services", #x ".desktop" ) ), create_##x() )
+#else // KLEO_STATIC_KCMODULES
+# define KCM_IMPORT_PLUGIN( x )
+# define addMyModule( x ) addModule( #x )
+#endif // KLEO_STATIC_KCMODULES
+
+KCM_IMPORT_PLUGIN( kleopatra_config_dirserv )
+#ifndef KDEPIM_MOBILE_UI
+KCM_IMPORT_PLUGIN( kleopatra_config_appear )
+#endif
+#ifdef HAVE_KLEOPATRACLIENT_LIBRARY
+# ifndef KDEPIM_MOBILE_UI
+KCM_IMPORT_PLUGIN( kleopatra_config_cryptooperations )
+# endif
+KCM_IMPORT_PLUGIN( kleopatra_config_smimevalidation )
+#endif
+KCM_IMPORT_PLUGIN( kleopatra_config_gnupgsystem )
+
 ConfigureDialog::ConfigureDialog( QWidget * parent )
   : KCMultiDialog( parent )
 {
@@ -56,13 +77,17 @@
 #endif
   showButton( User1, true );
 
-  addModule( "kleopatra_config_dirserv" );
-  addModule( "kleopatra_config_appear" );
+  addMyModule( kleopatra_config_dirserv );
+#ifndef KDEPIM_MOBILE_UI
+  addMyModule( kleopatra_config_appear );
+#endif
 #ifdef HAVE_KLEOPATRACLIENT_LIBRARY
-  addModule( "kleopatra_config_cryptooperations" );
-  addModule( "kleopatra_config_smimevalidation" );
+# ifndef KDEPIM_MOBILE_UI
+  addMyModule( kleopatra_config_cryptooperations );
 #endif
-  addModule( "kleopatra_config_gnupgsystem" );
+  addMyModule( kleopatra_config_smimevalidation );
+#endif
+  addMyModule( kleopatra_config_gnupgsystem );
 
   // We store the minimum size of the dialog on hide, because otherwise
   // the KCMultiDialog starts with the size of the first kcm, not
@@ -88,4 +113,7 @@
 ConfigureDialog::~ConfigureDialog() {
 }
 
+#undef addMyModule
+#undef KCM_IMPORT_PLUGIN
+
 #include "configuredialog.moc"
--- trunk/KDE/kdepim/kleopatra/config-kleopatra.h.cmake #1204300:1204301
@@ -32,3 +32,6 @@
 #define KPATH_SEPARATOR ':'
 #endif
 #endif
+
+/* Mirrored from cmake option */
+#cmakedefine KLEO_STATIC_KCMODULES 1