'KDE/kdelibs'

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

List:       kde-commits
Subject:    KDE/kdelibs
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2010-11-18 2:48:43
Message-ID: 20101118024843.CF4FAAC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1198285 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  +2 -2      dnssd/CMakeLists.txt  
 M  +2 -2      kdecore/CMakeLists.txt  
 M  +2 -2      kdeui/tests/proxymodeltestsuite/CMakeLists.txt  
 M  +3 -3      khtml/CMakeLists.txt  
 M  +1 -1      kjs/CMakeLists.txt  
 M  +16 -4     solid/solid/CMakeLists.txt  


--- trunk/KDE/kdelibs/dnssd/CMakeLists.txt #1198284:1198285
@@ -1,7 +1,7 @@
 project(dnssd)
 macro_optional_find_package(Avahi)
 macro_bool_to_01(AVAHI_FOUND HAVE_AVAHI)
-macro_log_feature(AVAHI_FOUND "Avahi" "For Linux and BSDs: a system which \
facilitates service discovery on a local network, based on the Zeroconf standard" \
"http://avahi.org" FALSE "" "Enables KDE applications access to multicast DNS/DNS-SD \
service discovery.") +macro_log_feature(AVAHI_FOUND "Avahi" "Facilities for service \
discovery on a local network" "http://avahi.org" FALSE "" "Either Avahi or DNSSD is \
required for KDE applications to make use of multicast DNS/DNS-SD service discovery") \
  if(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION)
    include_directories( ${KDE4_KDECORE_INCLUDES} )
@@ -35,7 +35,7 @@
 
    macro_optional_find_package(DNSSD)
    macro_bool_to_01(DNSSD_FOUND HAVE_DNSSD)
-   macro_log_feature(DNSSD_FOUND "DNSSD" "For MacOS and platforms without Avahi: A \
system which facilitates service discovery on a local network, based on the Zeroconf \
standard" "http://www.zeroconf.org"  FALSE "" "Enables KDE applications access to \
multicast DNS/DNS-SD service discovery.") +   macro_log_feature(DNSSD_FOUND "DNSSD" \
"Facilities for service discovery on a local network" "http://avahi.org" FALSE "" \
"Either Avahi or DNSSD is required for KDE applications to make use of multicast \
DNS/DNS-SD service discovery")  
    if (HAVE_DNSSD)
       include_directories( ${DNSSD_INCLUDE_DIR} )
--- trunk/KDE/kdelibs/kdecore/CMakeLists.txt #1198284:1198285
@@ -388,9 +388,9 @@
 
 set(SYS_INOTIFY_H_FOUND 0)
 if(SYS_INOTIFY_H_FOUND)
-   macro_log_feature(FAM_FOUND "FAM" "File Alteration Monitor" \
"http://oss.sgi.com/projects/fam" FALSE "" "You have file alteration notification \
support built into your kernel, however you might consider installing FAM as it also \
supports NFS.") +   macro_log_feature(FAM_FOUND "FAM" "File alteration notification \
support via a separate service" "http://oss.sgi.com/projects/fam" FALSE "" "You have \
file alteration notification support built into your kernel, however you might \
consider installing FAM as it also supports NFS.")  else(SYS_INOTIFY_H_FOUND)
-   macro_log_feature(FAM_FOUND "FAM" "File Alteration Monitor" \
"http://oss.sgi.com/projects/fam" FALSE "" "Provides file alteration notification \
facilities using a separate service.") +   macro_log_feature(FAM_FOUND "FAM" "File \
alteration notification support via a separate service" \
"http://oss.sgi.com/projects/fam" FALSE "" "Provides file alteration notification \
facilities using a separate service.")  endif(SYS_INOTIFY_H_FOUND)
 
 if(FAM_FOUND)
--- trunk/KDE/kdelibs/kdeui/tests/proxymodeltestsuite/CMakeLists.txt #1198284:1198285
@@ -52,10 +52,10 @@
 if(NOT proxymodeltestsuite_standalone)
   macro_log_feature(Grantlee_FOUND
     "Grantlee"
-    "Grantlee template system"
+    "ModelEventLogger code generation (part of the ProxyModel test suite)"
     "http://www.grantlee.org" FALSE
     "0.1.0"
-    "Required for the model logging feature"
+    "Grantlee is used for generating compilable code by the ModelEventLogger. \
Without Grantlee, the logger will do nothing."  )
 endif()
 
--- trunk/KDE/kdelibs/khtml/CMakeLists.txt #1198284:1198285
@@ -13,13 +13,13 @@
 add_subdirectory( tests )
 
 find_package(JPEG)
-macro_log_feature(JPEG_FOUND "libjpeg" "A library for reading and writing JPEG image \
files" "http://www.ijg.org" TRUE "" "Required by khtml.") \
+macro_log_feature(JPEG_FOUND "libjpeg" "JPEG image format support" \
"http://www.ijg.org" TRUE "" "Required by khtml.")  
 find_package(GIF)
-macro_log_feature(GIF_FOUND "giflib" "A library for manipulating GIF format image \
files" "http://sourceforge.net/projects/giflib" TRUE "" "Required by khtml.") \
+macro_log_feature(GIF_FOUND "giflib" "GIF image format support" \
"http://sourceforge.net/projects/giflib" TRUE "" "Required by khtml.")  
 find_package(PNG)
-macro_log_feature(PNG_FOUND "libpng" "A library for manipulating PNG image format \
files" "http://www.libpng.org/pub/png" TRUE "" "Required by khtml.") \
+macro_log_feature(PNG_FOUND "libpng" "PNG image format support" \
"http://www.libpng.org/pub/png" TRUE "" "Required by khtml.")  
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${KDE4_ENABLE_EXCEPTIONS}")
 
--- trunk/KDE/kdelibs/kjs/CMakeLists.txt #1198284:1198285
@@ -40,7 +40,7 @@
 
 include_directories(${KDE4_KDECORE_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/wtf \
${KDEWIN_INCLUDES} )  
-macro_log_feature(PCRE_FOUND "PCRE" "Perl Compatible Regular Expression" \
"http://www.pcre.org" FALSE "" "Lack of PCRE will result in extremely poor regular \
expression support in KJS. ") +macro_log_feature(PCRE_FOUND "PCRE" "Perl-compatible \
regular expressions in KJS" "http://www.pcre.org" FALSE "" "Without PCRE, KJS will \
have extremely poor regular expression support, breaking many webpages.")  
 # the check for pcre is in kdelibs/CMakeLists.txt
 if(PCRE_FOUND  AND NOT  KJS_FORCE_DISABLE_PCRE)
--- trunk/KDE/kdelibs/solid/solid/CMakeLists.txt #1198284:1198285
@@ -149,8 +149,8 @@
 
    macro_optional_find_package( UDev )
    macro_optional_find_package( HUpnp )
-   macro_log_feature( HUPNP_FOUND "HUPnP" "Qt-based library for building UPnP \
                devices and control points" "http://www.herqq.org" FALSE "" "" )
-   macro_log_feature( UDEV_FOUND "UDev" "UDev dynamic /dev directory " \
"http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" FALSE "" "" ) +   \
macro_log_feature( HUPNP_FOUND "HUPnP" "UPnP support for Solid" \
"http://www.herqq.org" FALSE "" "Allows Solid to provide information about UPnP \
devices on the network" ) +   macro_log_feature( UDEV_FOUND "UDev" "UDev support for \
Solid" "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" FALSE "" \
"Allows Solid to use UDev to provide information about devices on Linux" )  \
configure_file( config-solid.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-solid.h )  
    if ( HUPNP_FOUND )
@@ -386,10 +386,22 @@
 set(parser_FILE predicate_parser)
 
 find_package(Flex)
-macro_log_feature(FLEX_FOUND "Flex" "Fast lexical analyser generator" \
"http://flex.sourceforge.net" FALSE "" "Needed to build the Solid predicate parser.") \
+macro_log_feature(FLEX_FOUND +   "Flex"
+   "Allows the Solid predicate parser to be updated"
+   "http://flex.sourceforge.net"
+   FALSE
+   ""
+   "Required by the UpdateSolidPredicateParser target (mainly useful for \
developers)")  
 find_program(BISON_EXECUTABLE bison)
-macro_log_feature(BISON_EXECUTABLE "Bison" "Project parser generator (yacc \
replacement)" "http://www.gnu.org/software/bison" FALSE "" "Needed to build the Solid \
predicate parser.") +macro_log_feature(BISON_EXECUTABLE
+   "Bison"
+   "Allows the Solid predicate parser to be updated"
+   "http://www.gnu.org/software/bison"
+   FALSE
+   ""
+   "Required by the UpdateSolidPredicateParser target (mainly useful for \
developers)")  mark_as_advanced(BISON_EXECUTABLE)      # don't show it in the simple \
view in cmake-gui/ccmake  
 if (FLEX_EXECUTABLE AND BISON_EXECUTABLE)


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic