On Wednesday 11 Mar 2009 00:53:28 David Jarvie wrote:
> On Tuesday 10 Mar 2009 19:58:39 Alexander Neundorf wrote:
> > On Tuesday 10 March 2009, David Jarvie wrote:
> > > On Mon 9 March 2009 23:32:48 Alexander Neundorf wrote:
> >
> > ...
> >
> > > > It's no (real) problem to add a copy of FindPkgConfig.cmake again to
> > > > kdelibs/cmake/modules/.
> > >
> > > OK, here's a patch to FindPkgConfig.cmake (from cmake 2.6.2) to provide
> > > a QUIET option for pkg_check_modules(). For example,
> > >
> > > pkg_check_modules(PC_QIMAGEBLITZ QUIET qimageblitz)
> > >
> > > OK to commit to kdelibs/cmake/modules? If so, I'll do a patch to
> > > convert the relevant FindXXXX.cmake files.
> >
> > I didn't test it, but in general it looks good.
> > You may want to add a sentence what the new option does to the
> > documentation at the top.
> > So, from my side, go ahead and commit if it works for you.
>
> Now committed, including documentation.
I now attach patches for kdelibs, kdebase and kdepim to use the QUIET option
described above to suppress duplicate 'not found' messages from pkgconfig. I
have tried to ensure that this option is only used in cmake scripts in which
the pkgconfig messages would not add any information compared to the messages
output once the patches have been applied.
OK to commit?
--
David Jarvie.
KAlarm author and maintainer.
http://www.astrojar.org.uk/kalarm
Index: workspace/cmake/modules/FindCkConnector.cmake
===================================================================
--- workspace/cmake/modules/FindCkConnector.cmake (revision 936248)
+++ workspace/cmake/modules/FindCkConnector.cmake (working copy)
@@ -25,7 +25,7 @@
IF (PKG_CONFIG_FOUND)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
- pkg_check_modules(_CKCONNECTOR_PC ck-connector)
+ pkg_check_modules(_CKCONNECTOR_PC QUIET ck-connector)
ENDIF (PKG_CONFIG_FOUND)
ENDIF (NOT WIN32)
Index: workspace/cmake/modules/FindGooglegadgets.cmake
===================================================================
--- workspace/cmake/modules/FindGooglegadgets.cmake (revision 936248)
+++ workspace/cmake/modules/FindGooglegadgets.cmake (working copy)
@@ -19,7 +19,7 @@
# in the FIND_PATH() and FIND_LIBRARY() calls
if( NOT WIN32 )
INCLUDE(FindPkgConfig)
- PKG_CHECK_MODULES(GOOGLEGADGETS libggadget-1.0>=0.10.5 libggadget-qt-1.0>=0.10.5)
+ PKG_CHECK_MODULES(GOOGLEGADGETS QUIET libggadget-1.0>=0.10.5 libggadget-qt-1.0>=0.10.5)
endif( NOT WIN32 )
INCLUDE(FindPackageHandleStandardArgs)
Index: workspace/cmake/modules/FindDBus.cmake
===================================================================
--- workspace/cmake/modules/FindDBus.cmake (revision 936248)
+++ workspace/cmake/modules/FindDBus.cmake (working copy)
@@ -25,7 +25,7 @@
IF (PKG_CONFIG_FOUND)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
- pkg_check_modules(_DBUS_PC dbus-1)
+ pkg_check_modules(_DBUS_PC QUIET dbus-1)
ENDIF (PKG_CONFIG_FOUND)
ENDIF (NOT WIN32)
Index: cmake/modules/FindENCHANT.cmake
===================================================================
--- cmake/modules/FindENCHANT.cmake (revision 938015)
+++ cmake/modules/FindENCHANT.cmake (working copy)
@@ -22,7 +22,7 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
- pkg_check_modules(PC_ENCHANT enchant)
+ pkg_check_modules(PC_ENCHANT QUIET enchant)
set(ENCHANT_DEFINITIONS ${PC_ENCHANT_CFLAGS_OTHER})
endif (NOT WIN32)
Index: cmake/modules/FindBlitz.cmake
===================================================================
--- cmake/modules/FindBlitz.cmake (revision 938015)
+++ cmake/modules/FindBlitz.cmake (working copy)
@@ -23,7 +23,7 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
- pkg_check_modules(PC_BLITZ qimageblitz)
+ pkg_check_modules(PC_BLITZ QUIET qimageblitz)
endif (NOT WIN32)
find_path(BLITZ_INCLUDES
Index: cmake/modules/FindLibArt.cmake
===================================================================
--- cmake/modules/FindLibArt.cmake (revision 938015)
+++ cmake/modules/FindLibArt.cmake (working copy)
@@ -23,7 +23,7 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
- pkg_check_modules(PC_LIBART libart-2.0)
+ pkg_check_modules(PC_LIBART QUIET libart-2.0)
######### ?? where is this used ?? ###############
set(LIBART_DEFINITIONS ${PC_LIBART_CFLAGS_OTHER})
Index: cmake/modules/FindXmms.cmake
===================================================================
--- cmake/modules/FindXmms.cmake (revision 938015)
+++ cmake/modules/FindXmms.cmake (working copy)
@@ -22,7 +22,7 @@
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
- pkg_check_modules(PC_XMMS xmms)
+ pkg_check_modules(PC_XMMS QUIET xmms)
endif(NOT WIN32)
find_path(XMMS_INCLUDE_DIRS xmmsctrl.h
Index: cmake/modules/FindGStreamer.cmake
===================================================================
--- cmake/modules/FindGStreamer.cmake (revision 938015)
+++ cmake/modules/FindGStreamer.cmake (working copy)
@@ -24,7 +24,7 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
FIND_PACKAGE(PkgConfig)
- PKG_CHECK_MODULES(PC_GSTREAMER gstreamer-0.10)
+ PKG_CHECK_MODULES(PC_GSTREAMER QUIET gstreamer-0.10)
#MESSAGE(STATUS "DEBUG: GStreamer include directory = ${GSTREAMER_INCLUDE_DIRS}")
#MESSAGE(STATUS "DEBUG: GStreamer link directory = ${GSTREAMER_LIBRARY_DIRS}")
#MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_CFLAGS_OTHER}")
Index: cmake/modules/FindLCMS.cmake
===================================================================
--- cmake/modules/FindLCMS.cmake (revision 938015)
+++ cmake/modules/FindLCMS.cmake (working copy)
@@ -17,7 +17,7 @@
# in the FIND_PATH() and FIND_LIBRARY() calls
if(NOT WIN32)
find_package(PkgConfig)
- pkg_check_modules(PC_LCMS lcms)
+ pkg_check_modules(PC_LCMS QUIET lcms)
set(LCMS_DEFINITIONS ${PC_LCMS_CFLAGS_OTHER})
endif(NOT WIN32)
Index: cmake/modules/FindPulseAudio.cmake
===================================================================
--- cmake/modules/FindPulseAudio.cmake (revision 938015)
+++ cmake/modules/FindPulseAudio.cmake (working copy)
@@ -24,8 +24,8 @@
if (NOT WIN32)
include(FindPkgConfig)
- pkg_check_modules(PC_PULSEAUDIO libpulse>=${PULSEAUDIO_MINIMUM_VERSION})
- pkg_check_modules(PC_PULSEAUDIO_MAINLOOP libpulse-mainloop-glib)
+ pkg_check_modules(PC_PULSEAUDIO QUIET libpulse>=${PULSEAUDIO_MINIMUM_VERSION})
+ pkg_check_modules(PC_PULSEAUDIO_MAINLOOP QUIET libpulse-mainloop-glib)
endif (NOT WIN32)
FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h
Index: cmake/modules/FindLibXslt.cmake
===================================================================
--- cmake/modules/FindLibXslt.cmake (revision 938015)
+++ cmake/modules/FindLibXslt.cmake (working copy)
@@ -22,7 +22,7 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
- pkg_check_modules(PC_XSLT libxslt)
+ pkg_check_modules(PC_XSLT QUIET libxslt)
SET(LIBXSLT_DEFINITIONS ${PC_XSLT_CFLAGS_OTHER})
ENDIF (NOT WIN32)
Index: cmake/modules/FindQCA2.cmake
===================================================================
--- cmake/modules/FindQCA2.cmake (revision 938015)
+++ cmake/modules/FindQCA2.cmake (working copy)
@@ -26,7 +26,7 @@
if (NOT WIN32)
find_package(PkgConfig)
- pkg_check_modules(PC_QCA2 qca2)
+ pkg_check_modules(PC_QCA2 QUIET qca2)
set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS_OTHER})
endif (NOT WIN32)
Index: cmake/modules/FindXine.cmake
===================================================================
--- cmake/modules/FindXine.cmake (revision 938015)
+++ cmake/modules/FindXine.cmake (working copy)
@@ -21,7 +21,7 @@
find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
- pkg_check_modules(PC_LIBXINE libxine)
+ pkg_check_modules(PC_LIBXINE QUIET libxine)
endif (PKG_CONFIG_FOUND)
find_path(XINE_INCLUDE_DIR NAMES xine.h
Index: cmake/modules/FindPCRE.cmake
===================================================================
--- cmake/modules/FindPCRE.cmake (revision 938015)
+++ cmake/modules/FindPCRE.cmake (working copy)
@@ -22,7 +22,7 @@
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
- pkg_check_modules(PC_PCRE libpcre)
+ pkg_check_modules(PC_PCRE QUIET libpcre)
set(PCRE_DEFINITIONS ${PC_PCRE_CFLAGS_OTHER})
Index: cmake/modules/FindQImageBlitz.cmake
===================================================================
--- cmake/modules/FindQImageBlitz.cmake (revision 938015)
+++ cmake/modules/FindQImageBlitz.cmake (working copy)
@@ -20,7 +20,7 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
- pkg_check_modules(PC_QIMAGEBLITZ qimageblitz)
+ pkg_check_modules(PC_QIMAGEBLITZ QUIET qimageblitz)
endif (NOT WIN32)
find_path(QIMAGEBLITZ_INCLUDES
Index: cmake/modules/FindLibXml2.cmake
===================================================================
--- cmake/modules/FindLibXml2.cmake (revision 938015)
+++ cmake/modules/FindLibXml2.cmake (working copy)
@@ -22,7 +22,7 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
FIND_PACKAGE(PkgConfig)
- PKG_CHECK_MODULES(PC_LIBXML libxml-2.0)
+ PKG_CHECK_MODULES(PC_LIBXML QUIET libxml-2.0)
SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
ENDIF (NOT WIN32)
Index: cmake/modules/FindFontconfig.cmake
===================================================================
--- cmake/modules/FindFontconfig.cmake (revision 938015)
+++ cmake/modules/FindFontconfig.cmake (working copy)
@@ -23,7 +23,7 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
- pkg_check_modules(PC_FONTCONFIG fontconfig)
+ pkg_check_modules(PC_FONTCONFIG QUIET fontconfig)
set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER})
endif (NOT WIN32)
Index: cmake/modules/FindSqlite.cmake
===================================================================
--- cmake/modules/FindSqlite.cmake (revision 938015)
+++ cmake/modules/FindSqlite.cmake (working copy)
@@ -25,7 +25,7 @@
if( NOT WIN32 )
find_package(PkgConfig)
- pkg_check_modules(PC_SQLITE sqlite3)
+ pkg_check_modules(PC_SQLITE QUIET sqlite3)
set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER})
endif( NOT WIN32 )
Index: cmake/modules/FindOpenEXR.cmake
===================================================================
--- cmake/modules/FindOpenEXR.cmake (revision 938015)
+++ cmake/modules/FindOpenEXR.cmake (working copy)
@@ -21,7 +21,7 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
- pkg_check_modules(PC_OPENEXR OpenEXR)
+ pkg_check_modules(PC_OPENEXR QUIET OpenEXR)
FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h
HINTS
Index: cmake/modules/FindBlueZ.cmake
===================================================================
--- cmake/modules/FindBlueZ.cmake (revision 938015)
+++ cmake/modules/FindBlueZ.cmake (working copy)
@@ -25,7 +25,7 @@
if( NOT WIN32 )
find_package(PkgConfig)
- pkg_check_modules(PC_BLUEZ bluez)
+ pkg_check_modules(PC_BLUEZ QUIET bluez)
set(BLUEZ_DEFINITIONS ${PC_BLUEZ_CFLAGS_OTHER})
endif( NOT WIN32 )
Index: cmake/modules/FindUSB.cmake
===================================================================
--- cmake/modules/FindUSB.cmake (revision 938015)
+++ cmake/modules/FindUSB.cmake (working copy)
@@ -21,7 +21,7 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
- pkg_check_modules(PC_LIBUSB libusb)
+ pkg_check_modules(PC_LIBUSB QUIET libusb)
ENDIF(NOT WIN32)
FIND_PATH(LIBUSB_INCLUDE_DIR usb.h
Index: cmake/modules/FindStrigi.cmake
===================================================================
--- cmake/modules/FindStrigi.cmake (revision 938015)
+++ cmake/modules/FindStrigi.cmake (working copy)
@@ -55,7 +55,7 @@
if(NOT strigi_home)
find_package(PkgConfig)
if(PKG_CONFIG_EXECUTABLE)
- pkg_check_modules(STRIGI libstreamanalyzer>=${STRIGI_MIN_VERSION})
+ pkg_check_modules(STRIGI QUIET libstreamanalyzer>=${STRIGI_MIN_VERSION})
endif(PKG_CONFIG_EXECUTABLE)
endif(NOT strigi_home)
endif(NOT WIN32)
Index: cmake/modules/FindAGG.cmake
===================================================================
--- cmake/modules/FindAGG.cmake (revision 938015)
+++ cmake/modules/FindAGG.cmake (working copy)
@@ -21,7 +21,7 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
- pkg_check_modules(PC_AGG libagg)
+ pkg_check_modules(PC_AGG QUIET libagg)
set(AGG_DEFINITIONS ${PC_AGG_CFLAGS_OTHER})
endif (NOT WIN32)
Index: cmake/modules/FindOpenChange.cmake
===================================================================
--- cmake/modules/FindOpenChange.cmake (revision 936084)
+++ cmake/modules/FindOpenChange.cmake (working copy)
@@ -19,7 +19,7 @@
else (LIBMAPI_INCLUDE_DIRS AND LIBMAPI_LIBRARIES)
if(NOT WIN32)
find_package(PkgConfig)
- pkg_check_modules(libmapi libmapi)
+ pkg_check_modules(libmapi QUIET libmapi)
endif(NOT WIN32)
set(LIBMAPI_DEFINITIONS ${libmapi_CFLAGS})
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem
