[Kde-pim] KDE/kdepim

Christophe Giboudeaux cgiboudeaux at gmail.com
Tue Dec 15 11:15:53 GMT 2009 

SVN commit 1062618 by cgiboudeaux:

Add a new option for KDE 4.4: KDEPIM_BUILD_NEPOMUK_AGENTS. It is enabled by default.
Having soprano and nepomuk optional in kdelibs has some nasty effects on the kdepim applications,
particularly KAdressbook which looses some important features.

So, if this option is not explicitly disabled when building kdepim and kdepim-runtime, CMake will require:
* Shared Desktop Ontologies >= 0.2
* Soprano >= 2.3.70
* Nepomuk

Please keep in mind that kdepim will require these packages in KDE SC 4.5.

CCMAIL: kde-pim at kde.org



 M  +17 -9     CMakeLists.txt  
 M  +17 -9     runtime/CMakeLists.txt  


--- trunk/KDE/kdepim/CMakeLists.txt #1062617:1062618
@@ -7,12 +7,15 @@
 ############### Build Options ###############
 
 option(KDEPIM_BUILD_EXAMPLES "Build the kdepim example applications." FALSE)
+option(KDEPIM_BUILD_NEPOMUK_AGENTS "Build the different Nepomuk Agents. Requires Soprano and Nepomuk." TRUE)
 option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
 option(KDEPIM_ONLY_KLEO "Only build Kleopatra. This option will disable KDEPIM_BUILD_EVERYTHING and KDEPIM_ENTERPRISE_BUILD." FALSE)
+
 # if KDEPIM_ENTERPRISE_BUILD is defined, KDEPIM_ONLY_KLEO is disabled
 if(KDEPIM_ENTERPRISE_BUILD)
   set(KDEPIM_ONLY_KLEO FALSE)
   set(KDEPIM_BUILD_EVERYTHING FALSE)
+  set(KDEPIM_BUILD_NEPOMUK_AGENTS FALSE)
   message(STATUS "Enterprise build is enabled.")
 else(KDEPIM_ENTERPRISE_BUILD)
   # if KDEPIM_ONLY_KLEO is defined, KDEPIM_BUILD_EVERYTHING is disabled.
@@ -98,16 +101,21 @@
   find_package(QGpgme)
   macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to build KMail, KOrganizer and Kleopatra")
 
-  macro_optional_find_package(Nepomuk)
-  macro_log_feature(Nepomuk_FOUND "Nepomuk" "The Nepomuk libraries" "http://www.kde.org" FALSE "" "Nepomuk extends the search and tagging functionalities in KMail and Akonadi")
+  if(KDEPIM_BUILD_NEPOMUK_AGENTS)
+    set(SDO_MIN_VERSION 0.2)
+    set(SOPRANO_MIN_VERSION 2.3.70)
 
-  # We require SharedDesktopOntology if nepomuk is enabled and was found on the system.
-  if(WITH_Nepomuk AND Nepomuk_FOUND)
-    find_package(SharedDesktopOntologies 0.2)
-    macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" TRUE "0.2" "Ontologies necessary for the Nepomuk semantic desktop.")
-  endif(WITH_Nepomuk AND Nepomuk_FOUND)
+    find_package(SharedDesktopOntologies ${SDO_MIN_VERSION})
+    macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" TRUE "${SDO_MIN_VERSION}" "Ontologies necessary for the Nepomuk semantic desktop.")
 
+    find_package(Soprano)
+    macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "http://soprano.sourceforge.net" TRUE "${SOPRANO_MIN_VERSION}" "Soprano is needed for Nepomuk")
 
+    find_package(Nepomuk)
+    macro_log_feature(Nepomuk_FOUND "Nepomuk" "The Nepomuk libraries" "http://www.kde.org" TRUE "" "Nepomuk extends the search and tagging functionalities in KMail and Akonadi")
+  endif(KDEPIM_BUILD_NEPOMUK_AGENTS)
+
+
 ############### Needed commands before building anything ###############
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
@@ -204,11 +212,11 @@
     macro_optional_add_subdirectory(ksendemail)
     macro_optional_add_subdirectory(korganizer)
 
-    if( Nepomuk_FOUND )
+    if(KDEPIM_BUILD_NEPOMUK_AGENTS)
       include( SopranoAddOntology )
       add_subdirectory( ontologies )
       add_subdirectory( nepomuk_email_feeder )
-    endif( Nepomuk_FOUND )
+    endif(KDEPIM_BUILD_NEPOMUK_AGENTS)
   endif(QGPGME_FOUND)
 
   if(KDEPIM_BUILD_EVERYTHING)
--- trunk/KDE/kdepim/runtime/CMakeLists.txt #1062617:1062618
@@ -3,6 +3,12 @@
 # where to look first for cmake modules. This line must be the first one or cmake will use the system's FindFoo.cmake
 set(CMAKE_MODULE_PATH ${kdepim-runtime_SOURCE_DIR}/cmake/modules)
 
+
+############### Build Options ###############
+
+option(KDEPIM_BUILD_NEPOMUK_AGENTS "Build the different Nepomuk Agents. Requires Soprano and Nepomuk." TRUE)
+
+
 ############### search packages used by KDE ###############
 
 find_package(KDE4 REQUIRED)
@@ -23,18 +29,20 @@
 find_package(LibXml2)
 macro_log_feature(LIBXML2_FOUND "LibXML2" "Libraries used to develop XML applications" "http://xmlsoft.org" FALSE "" "Needed for building the knut Akonadi resource.")
 
-macro_optional_find_package(Soprano)
-macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "http://soprano.sourceforge.net" FALSE "" "Soprano is needed for Nepomuk")
+if(KDEPIM_BUILD_NEPOMUK_AGENTS)
+  set(SDO_MIN_VERSION 0.2)
+  set(SOPRANO_MIN_VERSION 2.3.70)
 
-macro_optional_find_package(Nepomuk)
-macro_log_feature(Nepomuk_FOUND "Nepomuk" "The Nepomuk libraries" "http://www.kde.org" FALSE "" "Nepomuk extends the search and tagging functionalities in KMail and Akonadi")
+  find_package(SharedDesktopOntologies ${SDO_MIN_VERSION})
+  macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" TRUE "${SDO_MIN_VERSION}" "Ontologies necessary for the Nepomuk semantic desktop.")
 
-# We require SharedDesktopOntology if nepomuk is enabled and was found on the system.
-if(WITH_Nepomuk AND Nepomuk_FOUND)
-  find_package(SharedDesktopOntologies 0.2)
-  macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" TRUE "0.2" "Ontologies necessary for the Nepomuk semantic desktop.")
-endif(WITH_Nepomuk AND Nepomuk_FOUND)
+  find_package(Soprano)
+  macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "http://soprano.sourceforge.net" TRUE "${SOPRANO_MIN_VERSION}" "Soprano is needed for Nepomuk")
 
+  find_package(Nepomuk)
+  macro_log_feature(Nepomuk_FOUND "Nepomuk" "The Nepomuk libraries" "http://www.kde.org" TRUE "" "Nepomuk extends the search and tagging functionalities in KMail and Akonadi")
+endif(KDEPIM_BUILD_NEPOMUK_AGENTS)
+
 find_package(Strigi)
 macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net" FALSE "" "")
 
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/

More information about the kde-pim mailing list