[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/conf
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-05-20 8:18:14
Message-ID: 1211271494.790014.25959.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 810182 by mutz:

Fix compilation with no usable assuan again (BUILD_libkleopatraclient=OFF)

 M  +35 -6     CMakeLists.txt  
 M  +2 -0      configuredialog.cpp  


--- trunk/KDE/kdepim/kleopatra/conf/CMakeLists.txt #810181:810182
@@ -9,14 +9,43 @@
   set( _kcm_kleopatra_extra_libs ${KDE4_KIO_LIBS} )
 endif ( ONLY_KLEO )
 
+if ( BUILD_libkleopatraclient )
+
+   set( _kcm_kleopatra_libkleopatraclient_extra_SRCS
+     smimevalidationconfigurationwidget.cpp
+     smimevalidationconfigurationpage.cpp
+     )
+   kde4_add_ui_files( _kcm_kleopatra_libkleopatraclient_extra_SRCS
+     smimevalidationconfigurationwidget.ui
+     )
+   kde4_add_kcfg_files( _kcm_kleopatra_libkleopatraclient_extra_SRCS
+     ${CMAKE_SOURCE_DIR}/kleopatra/kcfg/smimevalidationpreferences.kcfgc
+     )
+
+   set( _kcm_kleopatra_libkleopatraclient_extra_LIBS
+     kleopatraclientgui
+     )
+
+   set( _kcm_kleopatra_libkleopatraclient_extra_install_FILES
+     kleopatra_config_smimevalidation.desktop
+     )
+
+else ( BUILD_libkleopatraclient )
+  set( _kcm_kleopatra_libkleopatraclient_extra_SRCS
+    )
+  set( _kcm_kleopatra_libkleopatraclient_extra_LIBS
+    )
+  set( _kcm_kleopatra_libkleopatraclient_extra_install_FILES
+    )
+endif ( BUILD_libkleopatraclient )
+
 set(kcm_kleopatra_PART_SRCS 
    ${_kcm_kleopatra_kleo_only_SRCS}
    dirservconfigpage.cpp 
    appearanceconfigpage.cpp 
    appearanceconfigwidget.cpp 
    dnorderconfigpage.cpp
-   smimevalidationconfigurationwidget.cpp
-   smimevalidationconfigurationpage.cpp
+   ${_kcm_kleopatra_libkleopatraclient_extra_SRCS}
    )
 
 add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5152 )
@@ -29,13 +58,13 @@
 kde4_add_kcfg_files( kcm_kleopatra_PART_SRCS
   ${CMAKE_SOURCE_DIR}/kleopatra/kcfg/tooltippreferences.kcfgc
   ${CMAKE_SOURCE_DIR}/kleopatra/kcfg/emailoperationspreferences.kcfgc
-  ${CMAKE_SOURCE_DIR}/kleopatra/kcfg/smimevalidationpreferences.kcfgc
- )
+  )
+
 kde4_add_plugin(kcm_kleopatra ${kcm_kleopatra_PART_SRCS})
 
 
 
-target_link_libraries(kcm_kleopatra ${KDE4_KDEUI_LIBS} kleo kleopatraclientgui )
+target_link_libraries(kcm_kleopatra ${KDE4_KDEUI_LIBS} kleo \
${_kcm_kleopatra_libkleopatraclient_extra_LIBS} )  
 install(TARGETS kcm_kleopatra  DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -46,6 +75,6 @@
   kleopatra_config_dirserv.desktop
   kleopatra_config_appear.desktop
   kleopatra_config_dnorder.desktop
-  kleopatra_config_smimevalidation.desktop
+  ${_kcm_kleopatra_libkleopatraclient_extra_install_FILES}
   DESTINATION ${SERVICES_INSTALL_DIR})
 
--- trunk/KDE/kdepim/kleopatra/conf/configuredialog.cpp #810181:810182
@@ -59,7 +59,9 @@
   addModule( "kleopatra_config_dirserv" );
   addModule( "kleopatra_config_appear" );
   addModule( "kleopatra_config_dnorder" );
+#ifdef BUILD_libkleopatraclient
   addModule( "kleopatra_config_smimevalidation" );
+#endif
 
   // We store the minimum size of the dialog on hide, because otherwise
   // the KCMultiDialog starts with the size of the first kcm, not


[prev in list] [next in list] [prev in thread] [next in thread]