From kde-commits Fri Nov 19 15:58:49 2010 From: Alex Merry Date: Fri, 19 Nov 2010 15:58:49 +0000 To: kde-commits Subject: KDE/kdepimlibs Message-Id: <20101119155849.700C8AC8A0 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=129018237713562 SVN commit 1198759 by alexmerry: macro_log_feature's "DESCRIPTION" argument is meant to describe the features the package will provide if found, not describe the package itself (after all, users don't care what some random library _is_, they care what features installing it will provide them with). M +10 -10 CMakeLists.txt M +1 -1 akonadi/kmime/CMakeLists.txt M +2 -2 cmake/modules/FindGpgme.cmake M +2 -2 kldap/CMakeLists.txt --- trunk/KDE/kdepimlibs/CMakeLists.txt #1198758:1198759 @@ -67,7 +67,7 @@ else (WIN32) find_package(Boost ${Boost_MINIMUM_VERSION} COMPONENTS graph) endif (WIN32) -macro_log_feature(Boost_FOUND "Boost" "Boost C++ Libraries" "http://www.boost.org" TRUE ${Boost_MINIMUM_VERSION} "The Boost libraries boost and boost-graph are required by several critical KDEPIM apps.") +macro_log_feature(Boost_FOUND "Boost C++ Libraries" "Required by core components" "http://www.boost.org" TRUE ${Boost_MINIMUM_VERSION} "Boost must include the boost-graph library") @@ -82,27 +82,27 @@ #FindAkonadi.cmake is only there for compatibility reasons, but we don't want to use that. set(Akonadi_MIN_VERSION "1.4.52") find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET NO_MODULE) - macro_log_feature(Akonadi_FOUND "Akonadi" "Akonadi server libraries (from kdesupport)" "http://pim.kde.org/akonadi" TRUE "${Akonadi_MIN_VERSION}" "Akonadi is required to build KdepimLibs.") + macro_log_feature(Akonadi_FOUND "Akonadi server libraries" "Access to PIM storage and services" "http://pim.kde.org/akonadi" TRUE "${Akonadi_MIN_VERSION}" "") find_package(Sasl2) - macro_log_feature(SASL2_FOUND "cyrus-sasl" "Cyrus SASL API" "http://asg.web.cmu.edu/sasl/sasl-library.html" TRUE "" "Required to support authentication of logins in the IMAP and Sieve kioslaves.") + macro_log_feature(SASL2_FOUND "cyrus-sasl" "Login authentication for IMAP and Sieve" "http://asg.web.cmu.edu/sasl/sasl-library.html" TRUE "" "") include (ConfigureChecks.cmake) set(SHARED_MIME_INFO_MINIMUM_VERSION "0.30") find_package(SharedMimeInfo) - macro_log_feature(SHARED_MIME_INFO_FOUND "SMI" "SharedMimeInfo" "http://freedesktop.org/wiki/Software/shared-mime-info" TRUE "0.30" "SharedMimeInfo is required.") + macro_log_feature(SHARED_MIME_INFO_FOUND "shared-mime-info" "Information about filetypes" "http://freedesktop.org/wiki/Software/shared-mime-info" TRUE "0.30" "") 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.") + macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Ontology information for use with Nepomuk" "http://oscaf.sourceforge.net" TRUE "${SDO_MIN_VERSION}" "") find_package(Soprano) if (NOT WINCE) - macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "http://soprano.sourceforge.net" TRUE "${SOPRANO_MIN_VERSION}" "Soprano is needed for Nepomuk") + macro_log_feature(Soprano_FOUND "Soprano" "Storage of semantic data" "http://soprano.sourceforge.net" TRUE "${SOPRANO_MIN_VERSION}" "") else(NOT WINCE) - macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "http://soprano.sourceforge.net" FALSE "${SOPRANO_MIN_VERSION}" "Soprano is needed for Nepomuk") + macro_log_feature(Soprano_FOUND "Soprano" "Storage of semantic data" "http://soprano.sourceforge.net" FALSE "${SOPRANO_MIN_VERSION}" "") endif (NOT WINCE) if (SopranoFOUND) include(SopranoAddOntology) @@ -110,14 +110,14 @@ find_package(Nepomuk) if (WINCE) - macro_log_feature(Nepomuk_FOUND "Nepomuk" "The Nepomuk libraries" "http://www.kde.org" FALSE "" "Nepomuk is required to build the Akonadi libraries.") + macro_log_feature(Nepomuk_FOUND "Nepomuk" "Support for the semantic desktop, including indexing of PIM data" "http://www.kde.org" FALSE "" "") else(WINCE) - macro_log_feature(Nepomuk_FOUND "Nepomuk" "The Nepomuk libraries" "http://www.kde.org" TRUE "" "Nepomuk is required to build the Akonadi libraries.") + macro_log_feature(Nepomuk_FOUND "Nepomuk" "Support for the semantic desktop, including indexing of PIM data" "http://www.kde.org" TRUE "" "") endif (WINCE) set(LIBICAL_MIN_VERSION "0.42") find_package(Libical) - macro_log_feature(LIBICAL_FOUND "libical" "Reference implementation of the iCalendar data type and serialization format" "http://sourceforge.net/projects/freeassociation" TRUE "${LIBICAL_MIN_VERSION}" "Required for the critical PIM kcal and kcalcore libraries.") + macro_log_feature(LIBICAL_FOUND "libical" "Calendar support" "http://sourceforge.net/projects/freeassociation" TRUE "${LIBICAL_MIN_VERSION}" "Needed by the kcal and kcalcore libraries") endif (NOT KDEPIM_ONLY_KLEO) --- trunk/KDE/kdepimlibs/akonadi/kmime/CMakeLists.txt #1198758:1198759 @@ -9,7 +9,7 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII ${KDE4_ENABLE_EXCEPTIONS}" ) find_package(LibXslt) -macro_log_feature(XSLTPROC_EXECUTABLE "xsltproc" "The command line XSLT processor from libxslt" "http://xmlsoft.org/XSLT/" TRUE "" "Required to generate the D-Bus interfaces.") +macro_log_feature(XSLTPROC_EXECUTABLE "xsltproc" "Needed to generate D-Bus interface specifications" "http://xmlsoft.org/XSLT/" TRUE "" "") # generates a D-Bus interface description from a KConfigXT file macro(kcfg_generate_dbus_interface _kcfg _name) --- trunk/KDE/kdepimlibs/cmake/modules/FindGpgme.cmake #1198758:1198759 @@ -387,11 +387,11 @@ macro_log_feature( GPGME_FOUND "gpgme" - "GnuPG Made Easy Development Libraries" + "GNU Privacy Guard (GPG/PGP) support" ${_gpgme_homepage} ${_req} "${_GPGME_MIN_VERSION} or greater" - "Needed to provide GNU Privacy Guard support in KDE PIM applications. Necessary to compile many PIM application, including KMail." + "Necessary to compile many PIM applications, including KMail" ) else() --- trunk/KDE/kdepimlibs/kldap/CMakeLists.txt #1198758:1198759 @@ -5,11 +5,11 @@ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5322 ) macro_optional_find_package(Ldap) -macro_log_feature(LDAP_FOUND "OpenLDAP" "LDAP (Lightweight Directory Access Protocol) libraries" "http://www.openldap.org" FALSE "" "STRONGLY RECOMMENDED: Needed to provide LDAP functionality in KDE" ) +macro_log_feature(LDAP_FOUND "OpenLDAP" "LDAP support" "http://www.openldap.org" FALSE "" "STRONGLY RECOMMENDED: Without this, the KLDAP library will be useless" ) #look for Sasl2 in the top-level CMakeLists.txt file now #macro_optional_find_package(Sasl2) -#macro_log_feature(SASL2_FOUND "cyrus-sasl" "Cyrus SASL API" "http://asg.web.cmu.edu/sasl/sasl-library.html" FALSE "" "Needed to support authentication of logins" ) +#macro_log_feature(SASL2_FOUND "cyrus-sasl" "Support for authentication over LDAP" "http://asg.web.cmu.edu/sasl/sasl-library.html" FALSE "" "" ) check_include_files(sys/time.h HAVE_SYS_TIME_H)