On Sunday 27 of December 2009 19:06:18 Allen Winter wrote:
> From a kdepim point-of-view, Nepomuk must be a hard dependency as
> Kontact will have big problems without it.
>
> So either Nepomuk is a hard dependency for kdelibs or for kdepim.
>
> Might as well keep it a hard dependency for kdelibs.
First things first - Ok to commit the following change making nepomuk
mandatory (sic!) in kdepim (see attachment)?
Also what's desired kdelibs and kdepimlibs version for upcoming 4.4 version of
kdepim (and kdepim-runtime which is as we know distributed separately as
well)?
Currently it's a bit inconsistent (any kdelibs + 4.3.66 kdepimlibs or 4.2.87
in case of kdepim-runtime) - should I set it all to 4.4? (let's say 4.3.85). I
doubt you test it with multiple versions of mentioned packages so maybe
depending on versions you actually use for development (so is 4.4) is more
reasonable.
Also I would like to reorganize flow control in kdepim CMake files so that it
does not force all dependencies on *all* kdepim apps, but only on those who
actually need those dependencies (like it's the case in other better
buildsystem-wise organized modules like kdebase/*, kdeutils etc). For instance
requiring strigi or nepomuk when building knode is incorrect.
--
regards
MM
Index: runtime/CMakeLists.txt
===================================================================
--- runtime/CMakeLists.txt (revision 1066887)
+++ runtime/CMakeLists.txt (working copy)
@@ -4,11 +4,7 @@
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)
@@ -29,19 +25,17 @@
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.")
-if(KDEPIM_BUILD_NEPOMUK_AGENTS)
- set(SDO_MIN_VERSION 0.2)
- set(SOPRANO_MIN_VERSION 2.3.70)
+set(SDO_MIN_VERSION 0.2)
+set(SOPRANO_MIN_VERSION 2.3.70)
- 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(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(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(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")
find_package(Strigi)
macro_log_feature(STRIGI_FOUND "Strigi" "Index metadata of files" "http://strigi.sourceforge.net"; FALSE "" "")
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (revision 1066887)
+++ CMakeLists.txt (working copy)
@@ -7,7 +7,6 @@
############### 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)
@@ -15,7 +14,6 @@
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.
@@ -101,19 +99,17 @@
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")
- if(KDEPIM_BUILD_NEPOMUK_AGENTS)
- set(SDO_MIN_VERSION 0.2)
- set(SOPRANO_MIN_VERSION 2.3.70)
+ set(SDO_MIN_VERSION 0.2)
+ set(SOPRANO_MIN_VERSION 2.3.70)
- 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(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(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(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")
############### Needed commands before building anything ###############
@@ -212,11 +208,10 @@
macro_optional_add_subdirectory(ksendemail)
macro_optional_add_subdirectory(korganizer)
- if(KDEPIM_BUILD_NEPOMUK_AGENTS)
- include( SopranoAddOntology )
- add_subdirectory( ontologies )
- add_subdirectory( nepomuk_email_feeder )
- endif(KDEPIM_BUILD_NEPOMUK_AGENTS)
+ include( SopranoAddOntology )
+ add_subdirectory( ontologies )
+ add_subdirectory( nepomuk_email_feeder )
+
endif(QGPGME_FOUND)
if(KDEPIM_BUILD_EVERYTHING)
@@ -231,7 +226,7 @@
macro_optional_add_subdirectory(kjots)
macro_optional_add_subdirectory(knotes)
macro_optional_add_subdirectory(strigi-analyzer)
-
+
if(EXISTS ${CMAKE_SOURCE_DIR}/runtime)
macro_optional_add_subdirectory(runtime)
endif(EXISTS ${CMAKE_SOURCE_DIR}/runtime)
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem
