rev 10343 - in kde-extras/strigi/tags: . 0.5.9-1/debian 0.5.9-1/debian/patches
Fathi Boudra
fabo at alioth.debian.org
Mon Apr 28 21:10:19 UTC 2008
Author: fabo
Date: 2008-04-28 21:10:19 +0000 (Mon, 28 Apr 2008)
New Revision: 10343
Added:
kde-extras/strigi/tags/0.5.9-1/
kde-extras/strigi/tags/0.5.9-1/debian/changelog
kde-extras/strigi/tags/0.5.9-1/debian/patches/01_update_FindQt4.cmake.diff
kde-extras/strigi/tags/0.5.9-1/debian/patches/series
Removed:
kde-extras/strigi/tags/0.5.9-1/debian/changelog
kde-extras/strigi/tags/0.5.9-1/debian/patches/series
Log:
Tagging strigi 0.5.9-1
Copied: kde-extras/strigi/tags/0.5.9-1 (from rev 10295, kde-extras/strigi/trunk)
Deleted: kde-extras/strigi/tags/0.5.9-1/debian/changelog
Copied: kde-extras/strigi/tags/0.5.9-1/debian/changelog (from rev 10342, kde-extras/strigi/trunk/debian/changelog)
===================================================================
--- kde-extras/strigi/tags/0.5.9-1/debian/changelog (rev 0)
+++ kde-extras/strigi/tags/0.5.9-1/debian/changelog 2008-04-28 21:10:19 UTC (rev 10343)
@@ -0,0 +1,207 @@
+strigi (0.5.9-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update FindQt4.cmake local copy.
+
+ -- Fathi Boudra <fabo at debian.org> Mon, 28 Apr 2008 22:01:19 +0200
+
+strigi (0.5.8-2) experimental; urgency=low
+
+ [Ana Beatriz Guerrero Lopez]
+
+ * Build against Qt 4.4 in experimental:
+ - Add versioned build depend for libqt4-dev on >= 4.4.0~.
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Fri, 28 Mar 2008 12:54:14 +0100
+
+strigi (0.5.8-1) unstable; urgency=low
+
+ * New upstream release.
+ * Remove branch pull patch.
+ * Add Vcs-Browser and Vcs-Svn fields.
+ * Add Replaces kdegraphics-strigi-plugins as ico analyzer can be found
+ inside.
+
+ -- Fathi Boudra <fabo at debian.org> Wed, 20 Feb 2008 09:36:50 +0100
+
+strigi (0.5.7-2) unstable; urgency=low
+
+ * Update branch pull patch to r760102.
+ * Remove our cmake.mk. Merged in CDBS package.
+ * Clean up build dependencies.
+ * Update my e-mail address.
+ * Bump Standard-Version to 3.7.3.
+ * Use Homepage field.
+ * Update installed files.
+ * Build with --no-undefined and --as-needed linker flags.
+ * Remove libstreams-dev dependency on libstdc++-dev. (Closes: #454995)
+ * Add strict versioned shlibs. (Closes: #460296)
+ * Add CMAKE_CXX_COMPILER:FILEPATH=g++ to workaround g++ path not properly
+ set.
+
+ -- Fathi Boudra <fabo at debian.org> Sat, 12 Jan 2008 22:57:56 +0100
+
+strigi (0.5.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update branch pull patch to r729946.
+ * Add query.h, queryparser.h and variant.h to libstreamanalyzer-dev package.
+
+ -- Fathi Boudra <fboudra at free.fr> Fri, 26 Oct 2007 19:15:00 +0200
+
+strigi (0.5.6-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add branch pull patch to r727526.
+ * Add build dependencies: bison, libcppunit-dev, libexiv2-dev, libxml2-utils.
+ * Update libstreamanalyzer* packages:
+ * Add clucene index plugin.
+ * Add strigiea_jpeg plugin.
+ * Replace fieldproperties/strigi_* by xesam.rdfs.
+ * Add new include files.
+ * Update include files in libstreams-dev package.
+ * Remove watch file. Upstream website is not always updated with the release.
+ * Remove libcluceneindex* packages.
+ * Update Homepage.
+ * Add strict version dependency on -dev packages. Thanks to Sune.
+
+ -- Fathi Boudra <fboudra at free.fr> Sat, 20 Oct 2007 14:57:40 +0200
+
+strigi (0.5.5-2) unstable; urgency=low
+
+ * Add branch pull patch. Fixed call of endAnalysis(bool):
+ handleEnd() should not have a bool complete because dataeventinputstream
+ calls handleEnd(), so that EventThroughAnalyzer::handleEnd() now determines
+ 'complete' with datastream->status() == Eof.
+ * Add dbus as an alternative for dbus-x11. be smart with backporters.
+
+ -- Fathi Boudra <fboudra at free.fr> Fri, 10 Aug 2007 22:20:33 +0200
+
+strigi (0.5.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update copyright.
+ * Update libstreams-dev install file:
+ * Add StrigiConfig.cmake.
+ * Add encodinginputstream.h.
+ * Remove stringreader.h.
+
+ -- Fathi Boudra <fboudra at free.fr> Tue, 07 Aug 2007 08:53:09 +0200
+
+strigi (0.5.4-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #430955)
+ * Add iconv.h missing include. It fixes FTBFS with g++-4.2.
+ * Add dbus-x11 dependency to strigi-daemon package. Strigi needs session dbus
+ to start on request.
+ * Remove wv dependency to strigi-daemon. Strigi has native OLE parsing now.
+ * Add deskbar-plugins-strigi package.
+ * Add strigi-daemon dependency to strigi-client.
+ * Add python and python-support build dependencies.
+ * Update strigi-daemon package. Add dbus services.
+ * Update libstreams-dev package. Add textutils.h file.
+ * Replace deprecated ${Source-Version} by ${binary:Version}.
+
+ -- Fathi Boudra <fboudra at free.fr> Sat, 28 Jul 2007 15:26:39 +0200
+
+strigi (0.5.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update copyright.
+ * Remove branch pull patch to r623754.
+ * Remove include path patch. Merged upstream.
+ * Update gcc 4.3 patch.
+ * Update libstreams-dev installed files.
+ * Replace libstreamindexer by libstreamanalyzer.
+ * Add libcluceneindex package.
+ * Use default options. Comment DEB_CMAKE_EXTRA_FLAGS.
+ * Remove libssl-dev, libmagic-dev, libexpat1-dev and liblog4cxx9-dev
+ from build depends.
+
+ -- Fathi Boudra <fboudra at free.fr> Fri, 11 May 2007 21:17:54 +0200
+
+strigi (0.3.11-2) unstable; urgency=low
+
+ * Robust get-orig-source target
+ * Include gcc4.3 patch from Martin (Closes: #417714)
+
+ -- Mark Purcell <msp at debian.org> Wed, 02 May 2007 06:27:39 +0100
+
+strigi (0.3.11-1) experimental; urgency=low
+
+ * New upstream release (Closes: #407394)
+ * Remove 10_ftbfs_amd64 patch, merged upstream.
+ * Add branch pull patch to r623754.
+ * Split strigi-daemon package (Closes: #407398).
+ * Add libsearchclient, libstreamindexer, libstreams,
+ libstrigiqtdbusclient and strigi-utils packages.
+ * Add strigi-plugins to strigi-daeamon Suggests. (Closes: #406694)
+ * Remove lintian override.
+
+ -- Fathi Boudra <fboudra at free.fr> Fri, 19 Jan 2007 15:02:14 +0100
+
+strigi (0.3.10-1) experimental; urgency=low
+
+ [ Fathi Boudra ]
+ * Add debian/rules get-orig-source target for http://buildserver.net
+ * Add Section entry for strigi to fix linda error
+ * Add patch to fix FTBFS on amd64
+
+ [ Mark Purcell ]
+ * Update debian/watch
+
+ -- Fathi Boudra <fboudra at free.fr> Tue, 12 Dec 2006 17:29:44 +0100
+
+strigi (0.3.9-1) unstable; urgency=low
+
+ * New upstream release
+ * Remove patch to inotify support option, merged upstream
+ * Add poppler-utils and wv as Depends
+ * Include utils.mk to rules
+ * Add deepfind, deepgrep, luceneindexer and xmlindexer to
+ strigi-daemon.install
+ * Update strigi-daemon.lintian-overrides for 0.3.9 version
+
+ -- Fathi Boudra <fboudra at free.fr> Sun, 12 Nov 2006 19:23:58 +0100
+
+strigi (0.3.8-2) unstable; urgency=low
+
+ * Add patch to fix inotify support option (Closes: #389315)
+
+ -- Fathi Boudra <fboudra at free.fr> Mon, 25 Sep 2006 18:15:37 +0200
+
+strigi (0.3.8-1) unstable; urgency=low
+
+ * New upstream release (Closes: #387402)
+ * Remove patches merged upstream
+ * control: add libdbus-1-dev, libexpat1-dev, liblog4cxx9-dev to Build-Depends
+ * copyright:
+ * add Ben van Klinken and Flavio Castelli copyrights
+ * add dirent copyright and license
+ * rules: add explicit cmake extra flags for dbus, inotify, log4cxx support
+
+ -- Fathi Boudra <fboudra at free.fr> Fri, 15 Sep 2006 23:44:25 +0200
+
+strigi (0.3.2-3) unstable; urgency=low
+
+ * Update debian/patches/12_shared_streamindexer.diff
+ * Fix typo in build system (Closes: #383956)
+ * Update maintainers
+ * Maintainer: KDE Extras Team
+ * Uploaders: Mark Purcell and Fathi Boudra
+
+ -- Fathi Boudra <fboudra at free.fr> Mon, 21 Aug 2006 10:08:39 +0200
+
+strigi (0.3.2-2) unstable; urgency=low
+
+ * patches/12_shared_streamindexer.diff: streamindexer become shared library
+ * strigi-daemon.lintian-overrides: update for streamindexer shared library
+
+ -- Fathi Boudra <fboudra at free.fr> Wed, 12 Jul 2006 12:38:56 +0200
+
+strigi (0.3.2-1) unstable; urgency=low
+
+ * Initial release (Closes: #377243)
+
+ -- Fathi Boudra <fboudra at free.fr> Wed, 5 Jul 2006 11:57:10 +0200
+
Copied: kde-extras/strigi/tags/0.5.9-1/debian/patches/01_update_FindQt4.cmake.diff (from rev 10342, kde-extras/strigi/trunk/debian/patches/01_update_FindQt4.cmake.diff)
===================================================================
--- kde-extras/strigi/tags/0.5.9-1/debian/patches/01_update_FindQt4.cmake.diff (rev 0)
+++ kde-extras/strigi/tags/0.5.9-1/debian/patches/01_update_FindQt4.cmake.diff 2008-04-28 21:10:19 UTC (rev 10343)
@@ -0,0 +1,913 @@
+--- a/cmake/FindQt4.cmake
++++ b/cmake/FindQt4.cmake
+@@ -23,13 +23,14 @@
+ # QT_USE_QTTEST
+ # QT_USE_QTUITOOLS
+ # QT_USE_QTDBUS
++# QT_USE_QTSCRIPT
+ #
+ # All the libraries required are stored in a variable called QT_LIBRARIES.
+ # Add this variable to your TARGET_LINK_LIBRARIES.
+ #
+-# macro QT4_WRAP_CPP(outfiles inputfile ... )
+-# macro QT4_WRAP_UI(outfiles inputfile ... )
+-# macro QT4_ADD_RESOURCES(outfiles inputfile ... )
++# macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
++# macro QT4_WRAP_UI(outfiles inputfile ... OPTIONS ...)
++# macro QT4_ADD_RESOURCES(outfiles inputfile ... OPTIONS ...)
+ # macro QT4_AUTOMOC(inputfile ... )
+ # macro QT4_GENERATE_MOC(inputfile outputfile )
+ #
+@@ -43,16 +44,6 @@
+ # for all listed interface xml files
+ # the name will be automatically determined from the name of the xml file
+ #
+-# macro QT4_ADD_DBUS_INTERFACE_NO_NAMESPACE(outfiles interface basename)
+-# create a the interface without namespace header and implementation files with the
+-# given basename from the given interface xml file and add it to
+-# the list of sources
+-#
+-# macro QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE(outfiles inputfile ... )
+-# create the interface header without namespace and implementation files
+-# for all listed interface xml files
+-# the name will be automatically determined from the name of the xml file
+-#
+ # macro QT4_ADD_DBUS_ADAPTOR(outfiles xmlfile parentheader parentclassname [basename] )
+ # create a dbus adaptor (header and implementation file) from the xml file
+ # describing the interface, and add it to the list of sources. The adaptor
+@@ -69,6 +60,8 @@
+ # QT_FOUND If false, don't try to use Qt.
+ # QT4_FOUND If false, don't try to use Qt 4.
+ #
++# QT_EDITION Set to the edition of Qt (i.e. DesktopLight)
++# QT_EDITION_DESKTOPLIGHT True if QT_EDITION == DesktopLight
+ # QT_QTCORE_FOUND True if QtCore was found.
+ # QT_QTGUI_FOUND True if QtGui was found.
+ # QT_QT3SUPPORT_FOUND True if Qt3Support was found.
+@@ -118,44 +111,83 @@
+ #
+ # QT_PLUGINS_DIR Path to "plugins" for Qt4
+ #
+-# For every library of Qt, a QT_QTFOO_LIBRARY variable is defined, with the full path to the library.
++# For every library of Qt there are three variables:
++# QT_QTFOO_LIBRARY_RELEASE, which contains the full path to the release version
++# QT_QTFOO_LIBRARY_DEBUG, which contains the full path to the debug version
++# QT_QTFOO_LIBRARY, the full path to the release version if available, otherwise to the debug version
+ #
+ # So there are the following variables:
+ # The Qt3Support library: QT_QT3SUPPORT_LIBRARY
++# QT_QT3SUPPORT_LIBRARY_RELEASE
++# QT_QT3SUPPORT_DEBUG
+ #
+ # The QtAssistant library: QT_QTASSISTANT_LIBRARY
++# QT_QTASSISTANT_LIBRARY_RELEASE
++# QT_QTASSISTANT_LIBRARY_DEBUG
+ #
+ # The QtCore library: QT_QTCORE_LIBRARY
++# QT_QTCORE_LIBRARY_RELEASE
++# QT_QTCORE_LIBRARY_DEBUG
+ #
+ # The QtDBus library: QT_QTDBUS_LIBRARY
++# QT_QTDBUS_LIBRARY_RELEASE
++# QT_QTDBUS_LIBRARY_DEBUG
+ #
+ # The QtDesigner library: QT_QTDESIGNER_LIBRARY
++# QT_QTDESIGNER_LIBRARY_RELEASE
++# QT_QTDESIGNER_LIBRARY_DEBUG
+ #
+ # The QtDesignerComponents library: QT_QTDESIGNERCOMPONENTS_LIBRARY
++# QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE
++# QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG
+ #
+ # The QtGui library: QT_QTGUI_LIBRARY
++# QT_QTGUI_LIBRARY_RELEASE
++# QT_QTGUI_LIBRARY_DEBUG
+ #
+ # The QtMotif library: QT_QTMOTIF_LIBRARY
++# QT_QTMOTIF_LIBRARY_RELEASE
++# QT_QTMOTIF_LIBRARY_DEBUG
+ #
+ # The QtNetwork library: QT_QTNETWORK_LIBRARY
++# QT_QTNETWORK_LIBRARY_RELEASE
++# QT_QTNETWORK_LIBRARY_DEBUG
+ #
+ # The QtNsPLugin library: QT_QTNSPLUGIN_LIBRARY
++# QT_QTNSPLUGIN_LIBRARY_RELEASE
++# QT_QTNSPLUGIN_LIBRARY_DEBUG
+ #
+ # The QtOpenGL library: QT_QTOPENGL_LIBRARY
++# QT_QTOPENGL_LIBRARY_RELEASE
++# QT_QTOPENGL_LIBRARY_DEBUG
+ #
+ # The QtSql library: QT_QTSQL_LIBRARY
++# QT_QTSQL_LIBRARY_RELEASE
++# QT_QTSQL_LIBRARY_DEBUG
+ #
+ # The QtXml library: QT_QTXML_LIBRARY
++# QT_QTXML_LIBRARY_RELEASE
++# QT_QTXML_LIBRARY_DEBUG
+ #
+ # The QtSvg library: QT_QTSVG_LIBRARY
++# QT_QTSVG_LIBRARY_RELEASE
++# QT_QTSVG_LIBRARY_DEBUG
+ #
+ # The QtScript library: QT_QTSCRIPT_LIBRARY
++# QT_QTSCRIPT_LIBRARY_RELEASE
++# QT_QTSCRIPT_LIBRARY_DEBUG
+ #
+ # The QtTest library: QT_QTTEST_LIBRARY
++# QT_QTTEST_LIBRARY_RELEASE
++# QT_QTTEST_LIBRARY_DEBUG
+ #
+ # The qtmain library for Windows QT_QTMAIN_LIBRARY
++# QT_QTMAIN_LIBRARY_RELEASE
++# QT_QTMAIN_LIBRARY_DEBUG
+ #
+ # The QtUiTools library: QT_QTUITOOLS_LIBRARY
++# QT_QTUITOOLS_LIBRARY_RELEASE
++# QT_QTUITOOLS_LIBRARY_DEBUG
+ #
+ # also defined, but NOT for general use are
+ # QT_MOC_EXECUTABLE Where to find the moc tool.
+@@ -181,22 +213,13 @@
+ # (They make no sense in Qt4)
+ # QT_QT_LIBRARY Qt-Library is now split
+
+-# Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
+-# See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
+-
+-
+ INCLUDE(CheckSymbolExists)
+ INCLUDE(MacroAddFileDependencies)
+-INCLUDE(MacroPushRequiredVars)
+
+ SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
+
+ SET( QT_DEFINITIONS "")
+
+-IF (WIN32)
+- SET(QT_DEFINITIONS -DQT_DLL)
+-ENDIF(WIN32)
+-
+ SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
+
+ # macro for asking qmake to process pro files
+@@ -204,22 +227,33 @@
+ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake/tmp.pro
+ "message(CMAKE_MESSAGE<$$${invar}>)")
+
++ # Invoke qmake with the tmp.pro program to get the desired
++ # information. Use the same variable for both stdout and stderr
++ # to make sure we get the output on all platforms.
+ EXECUTE_PROCESS(COMMAND ${QT_QMAKE_EXECUTABLE}
+ WORKING_DIRECTORY
+ ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake
+ OUTPUT_VARIABLE _qmake_query_output
++ RESULT_VARIABLE _qmake_result
+ ERROR_VARIABLE _qmake_query_output )
+-
++
+ FILE(REMOVE_RECURSE
+ "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake")
+
+- STRING(REGEX REPLACE ".*CMAKE_MESSAGE<([^>]*).*" "\\1" ${outvar} "${_qmake_query_output}")
++ IF(_qmake_result)
++ MESSAGE(WARNING " querying qmake for ${invar}. qmake reported:\n${_qmake_query_output}")
++ ELSE(_qmake_result)
++ STRING(REGEX REPLACE ".*CMAKE_MESSAGE<([^>]*).*" "\\1" ${outvar} "${_qmake_query_output}")
++ ENDIF(_qmake_result)
++
+ ENDMACRO(QT_QUERY_QMAKE)
+
++GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
+ # check for qmake
+ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
+ $ENV{QTDIR}/bin
+ )
+
+@@ -343,8 +377,11 @@
+ IF (NOT QT_MKSPECS_DIR)
+ EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+ ARGS "-query QMAKE_MKSPECS"
+- OUTPUT_VARIABLE qt_mkspecs_dir )
+- SET(QT_MKSPECS_DIR ${qt_mkspecs_dir} CACHE PATH "The location of the Qt mkspecs")
++ OUTPUT_VARIABLE qt_mkspecs_dirs )
++ STRING(REPLACE ":" ";" qt_mkspecs_dirs "${qt_mkspecs_dirs}")
++ FIND_PATH(QT_MKSPECS_DIR qconfig.pri PATHS ${qt_mkspecs_dirs}
++ DOC "The location of the Qt mkspecs containing qconfig.pri"
++ NO_DEFAULT_PATH )
+ ENDIF (NOT QT_MKSPECS_DIR)
+
+ # ask qmake for the plugins directory
+@@ -387,8 +424,9 @@
+ # Find out what window system we're using
+ #
+ #############################################
+- # Save required includes and required_flags variables
+- macro_push_required_vars()
++ # Save required variable
++ SET(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES})
++ SET(CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS})
+ # Add QT_INCLUDE_DIR to CMAKE_REQUIRED_INCLUDES
+ SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_INCLUDE_DIR}")
+ # On Mac OS X when Qt has framework support, also add the framework path
+@@ -408,8 +446,9 @@
+ ENDIF (NOT QT_IS_QTCOPY)
+ ENDIF (QT_QTCOPY_REQUIRED)
+
+- # Restore CMAKE_REQUIRED_INCLUDES+CMAKE_REQUIRED_FLAGS variables
+- macro_pop_required_vars()
++ # Restore CMAKE_REQUIRED_INCLUDES and CMAKE_REQUIRED_FLAGS variables
++ SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})
++ SET(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE})
+ #
+ #############################################
+
+@@ -449,7 +488,7 @@
+ NO_DEFAULT_PATH
+ )
+
+- # Set QT_QTSVG_INCLUDE_DIR
++ # Set QT_QTSCRIPT_INCLUDE_DIR
+ FIND_PATH(QT_QTSCRIPT_INCLUDE_DIR QtScript
+ PATHS
+ ${QT_INCLUDE_DIR}/QtScript
+@@ -525,6 +564,7 @@
+ PATHS
+ ${QT_INCLUDE_DIR}/QtAssistant
+ ${QT_HEADERS_DIR}/QtAssistant
++ ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
+ NO_DEFAULT_PATH
+ )
+
+@@ -532,7 +572,8 @@
+ FIND_PATH(QT_QTDESIGNER_INCLUDE_DIR QDesignerComponents
+ PATHS
+ ${QT_INCLUDE_DIR}/QtDesigner
+- ${QT_HEADERS_DIR}/QtDesigner
++ ${QT_HEADERS_DIR}/QtDesigner
++ ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
+ NO_DEFAULT_PATH
+ )
+
+@@ -559,191 +600,94 @@
+ # Set QT_INCLUDES
+ SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default )
+
++ # Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore." as part of the filename
++ FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE NAMES QtCore QtCore4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
++ FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG NAMES QtCore_debug QtCored QtCored4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++
++ # Set QT_QT3SUPPORT_LIBRARY
++ FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY_RELEASE NAMES Qt3Support Qt3Support4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY_DEBUG NAMES Qt3Support_debug Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++
++ # Set QT_QTGUI_LIBRARY
++ FIND_LIBRARY(QT_QTGUI_LIBRARY_RELEASE NAMES QtGui QtGui4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTGUI_LIBRARY_DEBUG NAMES QtGui_debug QtGuid4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+- ########################################
+- #
+- # Setting the LIBRARY-Variables
+- #
+- ########################################
+-
+- IF (QT_USE_FRAMEWORKS)
+- # If FIND_LIBRARY found libraries in Apple frameworks, we would NOT have
+- # to jump through these hoops.
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+- SET(QT_QTCORE_FOUND TRUE)
+- SET(QT_QTCORE_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtCore" CACHE STRING "The QtCore library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+- SET(QT_QTCORE_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtGui.framework)
+- SET(QT_QTGUI_FOUND TRUE)
+- SET(QT_QTGUI_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtGui" CACHE STRING "The QtGui library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtGui.framework)
+- SET(QT_QTGUI_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtGui.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/Qt3Support.framework)
+- SET(QT_QT3SUPPORT_FOUND TRUE)
+- SET(QT_QT3SUPPORT_LIBRARY "-F${QT_LIBRARY_DIR} -framework Qt3Support" CACHE STRING "The Qt3Support library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/Qt3Support.framework)
+- SET(QT_QT3SUPPORT_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/Qt3Support.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtNetwork.framework)
+- SET(QT_QTNETWORK_FOUND TRUE)
+- SET(QT_QTNETWORK_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtNetwork" CACHE STRING "The QtNetwork library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtNetwork.framework)
+- SET(QT_QTNETWORK_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtNetwork.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtOpenGL.framework)
+- SET(QT_QTOPENGL_FOUND TRUE)
+- SET(QT_QTOPENGL_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtOpenGL" CACHE STRING "The QtOpenGL library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtOpenGL.framework)
+- SET(QT_QTOPENGL_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtOpenGL.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtSql.framework)
+- SET(QT_QTSQL_FOUND TRUE)
+- SET(QT_QTSQL_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtSql" CACHE STRING "The QtSql library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtSql.framework)
+- SET(QT_QTSQL_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtSql.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtXml.framework)
+- SET(QT_QTXML_FOUND TRUE)
+- SET(QT_QTXML_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtXml" CACHE STRING "The QtXml library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtXml.framework)
+- SET(QT_QTXML_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtXml.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtSvg.framework)
+- SET(QT_QTSVG_FOUND TRUE)
+- SET(QT_QTSVG_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtSvg" CACHE STRING "The QtSvg library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtSvg.framework)
+- SET(QT_QTSVG_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtSvg.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtDBus.framework)
+- SET(QT_QTDBUS_FOUND TRUE)
+- SET(QT_QTDBUS_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtDBus" CACHE STRING "The QtDBus library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtDBus.framework)
+- SET(QT_QTDBUS_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtDBus.framework)
+-
+- IF(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework)
+- SET(QT_QTTEST_FOUND TRUE)
+- SET(QT_QTTEST_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtTest" CACHE STRING "The QtTest library.")
+- ELSE(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework)
+- SET(QT_QTTEST_FOUND FALSE)
+- ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework)
+-
+- # WTF? why don't we have frameworks? :P
+- # Set QT_QTUITOOLS_LIBRARY
+- FIND_LIBRARY(QT_QTUITOOLS_LIBRARY NAMES QtUiTools QtUiTools4 PATHS ${QT_LIBRARY_DIR} )
+- # Set QT_QTSCRIPT_LIBRARY
+- FIND_LIBRARY(QT_QTSCRIPT_LIBRARY NAMES QtScript QtScript4 PATHS ${QT_LIBRARY_DIR} )
+-
+- ELSE (QT_USE_FRAMEWORKS)
+-
+- # Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore." as part of the filename
+- FIND_LIBRARY(QT_QTCORE_LIBRARY NAMES QtCore QtCore4 QtCored4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
+-
+- # Set QT_QT3SUPPORT_LIBRARY
+- FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY NAMES Qt3Support Qt3Support4 Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTGUI_LIBRARY
+- FIND_LIBRARY(QT_QTGUI_LIBRARY NAMES QtGui QtGui4 QtGuid4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ # Set QT_QTMOTIF_LIBRARY
++ IF(Q_WS_X11)
++ FIND_LIBRARY(QT_QTMOTIF_LIBRARY_RELEASE NAMES QtMotif PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTMOTIF_LIBRARY_DEBUG NAMES QtMotif_debug PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ ENDIF(Q_WS_X11)
+
+- # Set QT_QTMOTIF_LIBRARY
+- IF(Q_WS_X11)
+- FIND_LIBRARY(QT_QTMOTIF_LIBRARY NAMES QtMotif PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- ENDIF(Q_WS_X11)
+-
+- # Set QT_QTNETWORK_LIBRARY
+- FIND_LIBRARY(QT_QTNETWORK_LIBRARY NAMES QtNetwork QtNetwork4 QtNetworkd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTNSPLUGIN_LIBRARY
+- FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY NAMES QtNsPlugin PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTOPENGL_LIBRARY
+- FIND_LIBRARY(QT_QTOPENGL_LIBRARY NAMES QtOpenGL QtOpenGL4 QtOpenGLd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTSQL_LIBRARY
+- FIND_LIBRARY(QT_QTSQL_LIBRARY NAMES QtSql QtSql4 QtSqld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTXML_LIBRARY
+- FIND_LIBRARY(QT_QTXML_LIBRARY NAMES QtXml QtXml4 QtXmld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTSVG_LIBRARY
+- FIND_LIBRARY(QT_QTSVG_LIBRARY NAMES QtSvg QtSvg4 QtSvgd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTSCRIPT_LIBRARY
+- FIND_LIBRARY(QT_QTSCRIPT_LIBRARY NAMES QtScript QtScript4 QtScriptd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTUITOOLS_LIBRARY
+- FIND_LIBRARY(QT_QTUITOOLS_LIBRARY NAMES QtUiTools QtUiTools4 QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- # Set QT_QTTEST_LIBRARY
+- FIND_LIBRARY(QT_QTTEST_LIBRARY NAMES QtTest QtTest4 QtTestd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- FIND_LIBRARY(QT_QTDBUS_LIBRARY NAMES QtDBus QtDBus4 QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+- IF(MSVC)
+- FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE NAMES QtCore4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG NAMES QtCored4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY_RELEASE NAMES Qt3Support4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY_DEBUG NAMES Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTGUI_LIBRARY_RELEASE NAMES QtGui4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTGUI_LIBRARY_DEBUG NAMES QtGuid4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTNETWORK_LIBRARY_RELEASE NAMES QtNetwork4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTNETWORK_LIBRARY_DEBUG NAMES QtNetworkd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTOPENGL_LIBRARY_RELEASE NAMES QtOpenGL4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTOPENGL_LIBRARY_DEBUG NAMES QtOpenGLd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTSQL_LIBRARY_RELEASE NAMES QtSql4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTSQL_LIBRARY_DEBUG NAMES QtSqld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTXML_LIBRARY_RELEASE NAMES QtXml4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTXML_LIBRARY_DEBUG NAMES QtXmld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTSVG_LIBRARY_RELEASE NAMES QtSvg4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTSVG_LIBRARY_DEBUG NAMES QtSvgd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_RELEASE NAMES QtScript4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_DEBUG NAMES QtScriptd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_RELEASE NAMES QtUiTools QtUiTools4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_DEBUG NAMES QtUiToolsd QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTTEST_LIBRARY_RELEASE NAMES QtTest4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTTEST_LIBRARY_DEBUG NAMES QtTestd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTDBUS_LIBRARY_RELEASE NAMES QtDBus4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTDBUS_LIBRARY_DEBUG NAMES QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_RELEASE NAMES QtDesigner4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_DEBUG NAMES QtDesignerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG NAMES QtDesignerComponentsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+- ENDIF(MSVC)
+- ENDIF (QT_USE_FRAMEWORKS)
++ # Set QT_QTNETWORK_LIBRARY
++ FIND_LIBRARY(QT_QTNETWORK_LIBRARY_RELEASE NAMES QtNetwork QtNetwork4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTNETWORK_LIBRARY_DEBUG NAMES QtNetwork_debug QtNetworkd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++
++ # Set QT_QTNSPLUGIN_LIBRARY
++ FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY_RELEASE NAMES QtNsPlugin PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY_DEBUG NAMES QtNsPlugin_debug PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++
++ # Set QT_QTOPENGL_LIBRARY
++ FIND_LIBRARY(QT_QTOPENGL_LIBRARY_RELEASE NAMES QtOpenGL QtOpenGL4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTOPENGL_LIBRARY_DEBUG NAMES QtOpenGL_debug QtOpenGLd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++
++ # Set QT_QTSQL_LIBRARY
++ FIND_LIBRARY(QT_QTSQL_LIBRARY_RELEASE NAMES QtSql QtSql4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTSQL_LIBRARY_DEBUG NAMES QtSql_debug QtSqld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++
++ # Set QT_QTXML_LIBRARY
++ FIND_LIBRARY(QT_QTXML_LIBRARY_RELEASE NAMES QtXml QtXml4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTXML_LIBRARY_DEBUG NAMES QtXml_debug QtXmld4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++
++ # Set QT_QTSVG_LIBRARY
++ FIND_LIBRARY(QT_QTSVG_LIBRARY_RELEASE NAMES QtSvg QtSvg4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTSVG_LIBRARY_DEBUG NAMES QtSvg_debug QtSvgd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++
++ # Set QT_QTUITOOLS_LIBRARY
++ FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_RELEASE NAMES QtUiTools QtUiTools4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_DEBUG NAMES QtUiTools_debug QtUiToolsd QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ # QtUiTools not with other frameworks with binary installation (in /usr/lib)
++ IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
++ FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_RELEASE NAMES QtUiTools PATHS ${QT_LIBRARY_DIR})
++ ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
++
++ # Set QT_QTTEST_LIBRARY
++ FIND_LIBRARY(QT_QTTEST_LIBRARY_RELEASE NAMES QtTest QtTest4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTTEST_LIBRARY_DEBUG NAMES QtTest_debug QtTest_debug4 QtTestd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++
++ # Set QT_QTDBUS_LIBRARY
++ # This was introduced with Qt 4.2, where also the naming scheme for debug libs was changed
++ # So does any of the debug lib names listed here actually exist ?
++ FIND_LIBRARY(QT_QTDBUS_LIBRARY_RELEASE NAMES QtDBus QtDBus4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTDBUS_LIBRARY_DEBUG NAMES QtDBus_debug QtDBus_debug4 QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++
++ # Set QT_QTSCRIPT_LIBRARY
++ FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_RELEASE NAMES QtScript QtScript4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_DEBUG NAMES QtScript_debug QtScriptd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+- IF( NOT QT_QTCORE_LIBRARY )
++ IF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
+ IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
+- MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check CMakeFiles/CMakeError.log for more details.")
++ MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
+ ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
+- ENDIF( NOT QT_QTCORE_LIBRARY )
++ ENDIF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
+
+ # Set QT_QTASSISTANT_LIBRARY
+- FIND_LIBRARY(QT_QTASSISTANT_LIBRARY NAMES QtAssistantClient QtAssistantClient4 QtAssistant QtAssistant4 QtAssistantd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 QtAssistant QtAssistant4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClientd QtAssistantClientd4 QtAssistantClient_debug QtAssistant_debug QtAssistantd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+ # Set QT_QTDESIGNER_LIBRARY
+- FIND_LIBRARY(QT_QTDESIGNER_LIBRARY NAMES QtDesigner QtDesigner4 QtDesignerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_RELEASE NAMES QtDesigner QtDesigner4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_DEBUG NAMES QtDesigner_debug QtDesignerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+ # Set QT_QTDESIGNERCOMPONENTS_LIBRARY
+- FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY NAMES QtDesignerComponents QtDesignerComponents4 QtDesignerComponentsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents QtDesignerComponents4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG NAMES QtDesigner_debug QtDesignerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+ # Set QT_QTMAIN_LIBRARY
+ IF(WIN32)
+- FIND_LIBRARY(QT_QTMAIN_LIBRARY NAMES qtmain qtmaind PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain PATHS ${QT_LIBRARY_DIR}
++ NO_DEFAULT_PATH)
++ FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS ${QT_LIBRARY_DIR}
++ NO_DEFAULT_PATH)
+ ENDIF(WIN32)
+
+ ############################################
+@@ -753,44 +697,50 @@
+ ############################################
+
+ MACRO (_QT4_ADJUST_LIB_VARS basename)
+- IF (QT_${basename}_LIBRARY OR QT_${basename}_LIBRARY_DEBUG)
+-
+- IF(MSVC)
+- # Both set
+- IF (QT_${basename}_LIBRARY_RELEASE AND QT_${basename}_LIBRARY_DEBUG)
+- SET(QT_${basename}_LIBRARY optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG})
+- ENDIF (QT_${basename}_LIBRARY_RELEASE AND QT_${basename}_LIBRARY_DEBUG)
+-
+- # Only debug was found
+- IF (NOT QT_${basename}_LIBRARY_RELEASE AND QT_${basename}_LIBRARY_DEBUG)
+- SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_DEBUG})
+- ENDIF (NOT QT_${basename}_LIBRARY_RELEASE AND QT_${basename}_LIBRARY_DEBUG)
+-
+- # Only release was found
+- IF (QT_${basename}_LIBRARY_RELEASE AND NOT QT_${basename}_LIBRARY_DEBUG)
+- SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_RELEASE})
+- ENDIF (QT_${basename}_LIBRARY_RELEASE AND NOT QT_${basename}_LIBRARY_DEBUG)
++ IF (QT_${basename}_LIBRARY_RELEASE OR QT_${basename}_LIBRARY_DEBUG)
+
+- # Hmm, is this used anywhere ? Yes, in UseQt4.cmake. We are currently incompatible :-(
+- SET(QT_${basename}_LIBRARIES optimized ${QT_${basename}_LIBRARY} debug ${QT_${basename}_LIBRARY_DEBUG})
+-
+- ENDIF(MSVC)
++ # if only the release version was found, set the debug variable also to the release version
++ IF (QT_${basename}_LIBRARY_RELEASE AND NOT QT_${basename}_LIBRARY_DEBUG)
++ SET(QT_${basename}_LIBRARY_DEBUG ${QT_${basename}_LIBRARY_RELEASE})
++ SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_RELEASE})
++ SET(QT_${basename}_LIBRARIES ${QT_${basename}_LIBRARY_RELEASE})
++ ENDIF (QT_${basename}_LIBRARY_RELEASE AND NOT QT_${basename}_LIBRARY_DEBUG)
++
++ # if only the debug version was found, set the release variable also to the debug version
++ IF (QT_${basename}_LIBRARY_DEBUG AND NOT QT_${basename}_LIBRARY_RELEASE)
++ SET(QT_${basename}_LIBRARY_RELEASE ${QT_${basename}_LIBRARY_DEBUG})
++ SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_DEBUG})
++ SET(QT_${basename}_LIBRARIES ${QT_${basename}_LIBRARY_DEBUG})
++ ENDIF (QT_${basename}_LIBRARY_DEBUG AND NOT QT_${basename}_LIBRARY_RELEASE)
++
++ IF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE)
++ # if the generator supports configuration types then set
++ # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
++ IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
++ SET(QT_${basename}_LIBRARY optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG})
++ ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
++ # if there are no configuration types and CMAKE_BUILD_TYPE has no value
++ # then just use the release libraries
++ SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_RELEASE} )
++ ENDIF(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
++ SET(QT_${basename}_LIBRARIES optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG})
++ ENDIF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE)
+
+ SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY} CACHE FILEPATH "The Qt ${basename} library")
+
+ IF (QT_${basename}_LIBRARY)
+ SET(QT_${basename}_FOUND 1)
+ ENDIF (QT_${basename}_LIBRARY)
+-
+- ENDIF (QT_${basename}_LIBRARY OR QT_${basename}_LIBRARY_DEBUG)
+-
++
++ ENDIF (QT_${basename}_LIBRARY_RELEASE OR QT_${basename}_LIBRARY_DEBUG)
++
+ IF (QT_${basename}_INCLUDE_DIR)
+ #add the include directory to QT_INCLUDES
+ SET(QT_INCLUDES ${QT_INCLUDES} "${QT_${basename}_INCLUDE_DIR}")
+ ENDIF (QT_${basename}_INCLUDE_DIR)
+
+ # Make variables changeble to the advanced user
+- MARK_AS_ADVANCED(QT_${basename}_LIBRARY QT_${basename}_INCLUDE_DIR)
++ MARK_AS_ADVANCED(QT_${basename}_LIBRARY QT_${basename}_LIBRARY_RELEASE QT_${basename}_LIBRARY_DEBUG QT_${basename}_INCLUDE_DIR)
+ ENDMACRO (_QT4_ADJUST_LIB_VARS)
+
+
+@@ -812,8 +762,7 @@
+ _QT4_ADJUST_LIB_VARS(QTUITOOLS)
+ _QT4_ADJUST_LIB_VARS(QTTEST)
+ _QT4_ADJUST_LIB_VARS(QTDBUS)
+-
+-
++
+ # platform dependent libraries
+ IF(Q_WS_X11)
+ _QT4_ADJUST_LIB_VARS(QTMOTIF)
+@@ -821,6 +770,7 @@
+ IF(WIN32)
+ _QT4_ADJUST_LIB_VARS(QTMAIN)
+ ENDIF(WIN32)
++
+
+ #######################################
+ #
+@@ -886,6 +836,22 @@
+ #
+ ######################################
+
++ MACRO (QT4_EXTRACT_OPTIONS qt4_files qt4_options)
++ SET(${qt4_files} ${ARGN})
++ SET(${qt4_options})
++ LIST(FIND ${qt4_files} OPTIONS _index)
++ IF(NOT _index EQUAL -1)
++ LIST(REMOVE_ITEM ${qt4_files} OPTIONS)
++ LIST(LENGTH ${qt4_files} _length)
++ WHILE(_length GREATER ${_index})
++ LIST(GET ${qt4_files} ${_index} _opt_value)
++ LIST(REMOVE_AT ${qt4_files} ${_index})
++ LIST(APPEND ${qt4_options} ${_opt_value})
++ LIST(LENGTH ${qt4_files} _length)
++ ENDWHILE(_length GREATER ${_index})
++ ENDIF(NOT _index EQUAL -1)
++ ENDMACRO (QT4_EXTRACT_OPTIONS)
++
+ MACRO (QT4_GET_MOC_INC_DIRS _moc_INC_DIRS)
+ SET(${_moc_INC_DIRS})
+ GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
+@@ -893,6 +859,7 @@
+ FOREACH(_current ${_inc_DIRS})
+ SET(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current})
+ ENDFOREACH(_current ${_inc_DIRS})
++
+ ENDMACRO(QT4_GET_MOC_INC_DIRS)
+
+
+@@ -914,20 +881,20 @@
+
+
+ # QT4_WRAP_CPP(outfiles inputfile ... )
+- # TODO perhaps add support for -D, -U and other minor options
+
+ MACRO (QT4_WRAP_CPP outfiles )
+ # get include dirs
+ QT4_GET_MOC_INC_DIRS(moc_includes)
++ QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
+
+- FOREACH (it ${ARGN})
++ FOREACH (it ${moc_files})
+ GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
+ GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+
+ SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx)
+ ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+ COMMAND ${QT_MOC_EXECUTABLE}
+- ARGS ${moc_includes} -o ${outfile} ${it}
++ ARGS ${moc_includes} ${moc_options} -o ${outfile} ${it}
+ DEPENDS ${it})
+ SET(${outfiles} ${${outfiles}} ${outfile})
+ ENDFOREACH(it)
+@@ -938,14 +905,15 @@
+ # QT4_WRAP_UI(outfiles inputfile ... )
+
+ MACRO (QT4_WRAP_UI outfiles )
++ QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
+
+- FOREACH (it ${ARGN})
++ FOREACH (it ${ui_files})
+ GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
+ GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+ SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
+ ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+ COMMAND ${QT_UIC_EXECUTABLE}
+- ARGS -o ${outfile} ${infile}
++ ARGS ${ui_options} -o ${outfile} ${infile}
+ MAIN_DEPENDENCY ${infile})
+ SET(${outfiles} ${${outfiles}} ${outfile})
+ ENDFOREACH (it)
+@@ -954,27 +922,31 @@
+
+
+ # QT4_ADD_RESOURCES(outfiles inputfile ... )
+- # TODO perhaps consider adding support for compression and root options to rcc
+
+ MACRO (QT4_ADD_RESOURCES outfiles )
++ QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
+
+- FOREACH (it ${ARGN})
++ FOREACH (it ${rcc_files})
+ GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
+ GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+ GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
+ SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
+- # parse file for dependencies
++ # parse file for dependencies
++ # all files are absolute paths or relative to the location of the qrc file
+ FILE(READ "${infile}" _RC_FILE_CONTENTS)
+ STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
+-
+ SET(_RC_DEPENDS)
+ FOREACH(_RC_FILE ${_RC_FILES})
+ STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
+- SET(_RC_DEPENDS ${_RC_DEPENDS} "${rc_path}/${_RC_FILE}")
++ STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
++ IF(NOT _ABS_PATH_INDICATOR)
++ SET(_RC_FILE "${rc_path}/${_RC_FILE}")
++ ENDIF(NOT _ABS_PATH_INDICATOR)
++ SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
+ ENDFOREACH(_RC_FILE)
+ ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+ COMMAND ${QT_RCC_EXECUTABLE}
+- ARGS -name ${outfilename} -o ${outfile} ${infile}
++ ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
+ MAIN_DEPENDENCY ${infile}
+ DEPENDS ${_RC_DEPENDS})
+ SET(${outfiles} ${${outfiles}} ${outfile})
+@@ -987,18 +959,11 @@
+ SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
+ SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
+ SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
+-
+- GET_SOURCE_FILE_PROPERTY(_nonamespace ${_infile} NO_NAMESPACE)
+- IF ( _nonamespace )
+- SET(_params -N -m -p)
+- ELSE ( _nonamespace )
+- SET(_params -m -p)
+- ENDIF ( _nonamespace )
+-
+- ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
+- COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} ${_basename} ${_infile}
++
++ ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
++ COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -p ${_basename} ${_infile}
+ DEPENDS ${_infile})
+-
++
+ SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
+
+ QT4_GENERATE_MOC(${_header} ${_moc})
+@@ -1007,33 +972,18 @@
+ MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc})
+
+ ENDMACRO(QT4_ADD_DBUS_INTERFACE)
+-
+- MACRO(QT4_ADD_DBUS_INTERFACE_NO_NAMESPACE _sources _interface _basename)
+- SET_SOURCE_FILES_PROPERTIES(${_interface} PROPERTIES NO_NAMESPACE TRUE)
+- QT4_ADD_DBUS_INTERFACE(${_sources} ${_interface} ${_basename})
+- ENDMACRO(QT4_ADD_DBUS_INTERFACE_NO_NAMESPACE)
+-
+- # Internal (avoid to duplicate code between QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE and QT4_ADD_DBUS_INTERFACES
+- MACRO(_QT4_ADD_DBUS_INTERFACES _sources _filename)
+- GET_FILENAME_COMPONENT(_infile ${_filename} ABSOLUTE)
++
++
++ MACRO(QT4_ADD_DBUS_INTERFACES _sources)
++ FOREACH (_current_FILE ${ARGN})
++ GET_FILENAME_COMPONENT(_infile ${_current_FILE} ABSOLUTE)
+ # get the part before the ".xml" suffix
+ STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2" _basename ${_current_FILE})
+ STRING(TOLOWER ${_basename} _basename)
+- QT4_ADD_DBUS_INTERFACE(${_sources} ${_infile} ${_basename}interface)
+- ENDMACRO(_QT4_ADD_DBUS_INTERFACES)
+-
+- MACRO(QT4_ADD_DBUS_INTERFACES _sources)
+- FOREACH (_current_FILE ${ARGN})
+- _QT4_ADD_DBUS_INTERFACES(${_sources} ${_current_FILE})
++ QT4_ADD_DBUS_INTERFACE(${_sources} ${_infile} ${_basename}interface)
+ ENDFOREACH (_current_FILE)
+ ENDMACRO(QT4_ADD_DBUS_INTERFACES)
+-
+- MACRO(QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE _sources)
+- FOREACH (_current_FILE ${ARGN})
+- SET_SOURCE_FILES_PROPERTIES(${_current_FILE} PROPERTIES NO_NAMESPACE TRUE)
+- _QT4_ADD_DBUS_INTERFACES(${_sources} ${_current_FILE})
+- ENDFOREACH (_current_FILE)
+- ENDMACRO(QT4_ADD_DBUS_INTERFACES_NO_NAMESPACE)
++
+
+ MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName )
+ SET(_customName "${ARGV1}")
+@@ -1144,31 +1094,12 @@
+ IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
+ SET( QT4_FOUND "YES" )
+ IF( NOT Qt4_FIND_QUIETLY)
+- IF (WIN32)
+- MESSAGE(STATUS "Found Qt-Version ${QTVERSION} with qmake at ${QT_QMAKE_EXECUTABLE}")
+- ELSE (WIN32)
+- MESSAGE(STATUS "Found Qt-Version ${QTVERSION}")
+- ENDIF (WIN32)
++ MESSAGE(STATUS "Found Qt-Version ${QTVERSION}")
+ ENDIF( NOT Qt4_FIND_QUIETLY)
+ ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
+ SET( QT4_FOUND "NO")
+ SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
+ IF( Qt4_FIND_REQUIRED)
+- IF ( NOT QT_LIBRARY_DIR )
+- MESSAGE(STATUS "Qt libraries NOT found!")
+- ENDIF(NOT QT_LIBRARY_DIR )
+- IF ( NOT QT_INCLUDE_DIR )
+- MESSAGE(STATUS "Qt includes NOT found!")
+- ENDIF( NOT QT_INCLUDE_DIR )
+- IF ( NOT QT_MOC_EXECUTABLE )
+- MESSAGE(STATUS "Qt's moc NOT found!")
+- ENDIF( NOT QT_MOC_EXECUTABLE )
+- IF ( NOT QT_UIC_EXECUTABLE )
+- MESSAGE(STATUS "Qt's uic NOT found!")
+- ENDIF( NOT QT_UIC_EXECUTABLE )
+- IF ( NOT QT_RCC_EXECUTABLE )
+- MESSAGE(STATUS "Qt's rcc NOT found!")
+- ENDIF( NOT QT_RCC_EXECUTABLE )
+ MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
+ ENDIF( Qt4_FIND_REQUIRED)
+ ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
+@@ -1177,19 +1108,79 @@
+
+ #######################################
+ #
+- # System dependent settings
++ # Qt configuration
+ #
+ #######################################
+- # for unix add X11 stuff
+- IF(UNIX)
+- # on OS X X11 may not be required
+- IF (Q_WS_X11)
+- FIND_PACKAGE(X11 REQUIRED)
+- ENDIF (Q_WS_X11)
+- FIND_PACKAGE(Threads)
+- SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+- ENDIF(UNIX)
++ IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
++ FILE(READ ${QT_MKSPECS_DIR}/qconfig.pri _qconfig_FILE_contents)
++ STRING(REGEX MATCH "QT_CONFIG[^\n]+" QT_QCONFIG ${_qconfig_FILE_contents})
++ STRING(REGEX MATCH "CONFIG[^\n]+" QT_CONFIG ${_qconfig_FILE_contents})
++ STRING(REGEX MATCH "EDITION[^\n]+" QT_EDITION ${_qconfig_FILE_contents})
++ ENDIF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
++ IF("${QT_EDITION}" MATCHES "DesktopLight")
++ SET(QT_EDITION_DESKTOPLIGHT 1)
++ ENDIF("${QT_EDITION}" MATCHES "DesktopLight")
++
++
++ ###############################################
++ #
++ # configuration/system dependent settings
++ #
++ ###############################################
++
++ SET(QT_GUI_LIB_DEPENDENCIES "")
++ SET(QT_CORE_LIB_DEPENDENCIES "")
++
++ # shared build needs -DQT_SHARED
++ IF(NOT QT_CONFIG MATCHES "static")
++ # warning currently only qconfig.pri on Windows potentially contains "static"
++ # so QT_SHARED might not get defined properly on Mac/X11 (which seems harmless right now)
++ # Trolltech said they'd consider exporting it for all platforms in future releases.
++ SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_SHARED)
++ ENDIF(NOT QT_CONFIG MATCHES "static")
++
++ ## clock-monotonic, just see if we need to link with rt
++ IF(QT_QCONFIG MATCHES "clock-monotonic")
++ SET(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES})
++ SET(CMAKE_REQUIRED_LIBRARIES rt)
++ CHECK_SYMBOL_EXISTS(_POSIX_TIMERS "unistd.h;time.h" QT_POSIX_TIMERS)
++ SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE})
++ IF(QT_POSIX_TIMERS)
++ FIND_LIBRARY(QT_RT_LIBRARY NAMES rt)
++ SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_RT_LIBRARY})
++ MARK_AS_ADVANCED(QT_RT_LIBRARY)
++ ENDIF(QT_POSIX_TIMERS)
++ ENDIF(QT_QCONFIG MATCHES "clock-monotonic")
++
++ IF(Q_WS_X11)
++ # X11 libraries Qt absolutely depends on
++ QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11")
++ SEPARATE_ARGUMENTS(QT_LIBS_X11)
++ FOREACH(QT_X11_LIB ${QT_LIBS_X11})
++ STRING(REGEX REPLACE "-l" "" QT_X11_LIB "${QT_X11_LIB}")
++ SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY")
++ FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11})
++ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}})
++ MARK_AS_ADVANCED(${QT_TMP_STR})
++ ENDFOREACH(QT_X11_LIB)
++
++ QT_QUERY_QMAKE(QT_LIBS_THREAD "QMAKE_LIBS_THREAD")
++ SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD})
++
++ QT_QUERY_QMAKE(QMAKE_LIBS_DYNLOAD "QMAKE_LIBS_DYNLOAD")
++ SET (QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QMAKE_LIBS_DYNLOAD})
+
++ ENDIF(Q_WS_X11)
++
++ IF(Q_WS_WIN)
++ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} imm32 winmm)
++ SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ws2_32)
++ ENDIF(Q_WS_WIN)
++
++ IF(Q_WS_MAC)
++ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} "-framework Carbon" "-framework QuickTime")
++ SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
++ ENDIF(Q_WS_MAC)
+
+ #######################################
+ #
Deleted: kde-extras/strigi/tags/0.5.9-1/debian/patches/series
Copied: kde-extras/strigi/tags/0.5.9-1/debian/patches/series (from rev 10342, kde-extras/strigi/trunk/debian/patches/series)
===================================================================
--- kde-extras/strigi/tags/0.5.9-1/debian/patches/series (rev 0)
+++ kde-extras/strigi/tags/0.5.9-1/debian/patches/series 2008-04-28 21:10:19 UTC (rev 10343)
@@ -0,0 +1 @@
+01_update_FindQt4.cmake.diff
More information about the pkg-kde-commits
mailing list