rev 14395 - in trunk/packages/polkit-qt/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Tue Apr 14 11:39:06 UTC 2009


Author: fabo
Date: 2009-04-14 11:39:05 +0000 (Tue, 14 Apr 2009)
New Revision: 14395

Added:
   trunk/packages/polkit-qt/debian/patches/
   trunk/packages/polkit-qt/debian/patches/01_remove_cmake_modules.diff
   trunk/packages/polkit-qt/debian/patches/series
Modified:
   trunk/packages/polkit-qt/debian/control
   trunk/packages/polkit-qt/debian/copyright
   trunk/packages/polkit-qt/debian/rules
Log:
Add patch to remove duplicated cmake 2.6 modules.
Remove libx11 build dependency. Build fixed using the patch.
Add quilt build dependency.
Update copyright: use same license for packaging as chosen by upstream.


Modified: trunk/packages/polkit-qt/debian/control
===================================================================
--- trunk/packages/polkit-qt/debian/control	2009-04-14 10:38:02 UTC (rev 14394)
+++ trunk/packages/polkit-qt/debian/control	2009-04-14 11:39:05 UTC (rev 14395)
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Daniel Nicoletti <dantti85-debian at yahoo.com.br>
 Uploaders: Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 7), cmake, automoc, libqt4-dev, libx11-dev,
+Build-Depends: quilt, debhelper (>= 7), cmake, automoc, libqt4-dev,
  libpolkit-dev, libpolkit-dbus-dev, libpolkit-grant-dev
 Standards-Version: 3.8.1
 Section: libs

Modified: trunk/packages/polkit-qt/debian/copyright
===================================================================
--- trunk/packages/polkit-qt/debian/copyright	2009-04-14 10:38:02 UTC (rev 14394)
+++ trunk/packages/polkit-qt/debian/copyright	2009-04-14 11:39:05 UTC (rev 14395)
@@ -38,12 +38,13 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+Public License can be found in `/usr/share/common-licenses/LGPL-2' and
+`/usr/share/common-licenses/LGPL-3'.
 
 The Debian packaging is:
 
     Copyright (C) 2009 Fathi Boudra <fabo at debian.org>
     Copyright (C) 2009 Daniel Nicoletti <dantti85-pk at yahoo.com.br>
 
-and is licensed under the GPL version 3, 
-see `/usr/share/common-licenses/GPL-3'.
+and is licensed under upstream license term:
+the GNU Lesser General Public License version 2 or any later version.

Added: trunk/packages/polkit-qt/debian/patches/01_remove_cmake_modules.diff
===================================================================
--- trunk/packages/polkit-qt/debian/patches/01_remove_cmake_modules.diff	                        (rev 0)
+++ trunk/packages/polkit-qt/debian/patches/01_remove_cmake_modules.diff	2009-04-14 11:39:05 UTC (rev 14395)
@@ -0,0 +1,1813 @@
+--- a/cmake/modules/FindPkgConfig.cmake
++++ /dev/null
+@@ -1,360 +0,0 @@
+-# - a pkg-config module for CMake
+-#
+-# Usage:
+-#   pkg_check_modules(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
+-#     checks for all the given modules
+-#
+-#   pkg_search_module(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
+-#     checks for given modules and uses the first working one
+-#
+-# When the 'REQUIRED' argument was set, macros will fail with an error
+-# when module(s) could not be found
+-#
+-# It sets the following variables:
+-#   PKG_CONFIG_FOUND         ... true if pkg-config works on the system
+-#   PKG_CONFIG_EXECUTABLE    ... pathname of the pkg-config program
+-#   <PREFIX>_FOUND           ... set to 1 if module(s) exist
+-#
+-# For the following variables two sets of values exist; first one is the
+-# common one and has the given PREFIX. The second set contains flags
+-# which are given out when pkgconfig was called with the '--static'
+-# option.
+-#   <XPREFIX>_LIBRARIES      ... only the libraries (w/o the '-l')
+-#   <XPREFIX>_LIBRARY_DIRS   ... the paths of the libraries (w/o the '-L')
+-#   <XPREFIX>_LDFLAGS        ... all required linker flags
+-#   <XPREFIX>_LDFLAGS_OTHER  ... all other linker flags
+-#   <XPREFIX>_INCLUDE_DIRS   ... the '-I' preprocessor flags (w/o the '-I')
+-#   <XPREFIX>_CFLAGS         ... all required cflags
+-#   <XPREFIX>_CFLAGS_OTHER   ... the other compiler flags
+-#
+-#   <XPREFIX> = <PREFIX>        for common case
+-#   <XPREFIX> = <PREFIX>_STATIC for static linking
+-#
+-# There are some special variables whose prefix depends on the count
+-# of given modules. When there is only one module, <PREFIX> stays
+-# unchanged. When there are multiple modules, the prefix will be
+-# changed to <PREFIX>_<MODNAME>:
+-#   <XPREFIX>_VERSION    ... version of the module
+-#   <XPREFIX>_PREFIX     ... prefix-directory of the module
+-#   <XPREFIX>_INCLUDEDIR ... include-dir of the module
+-#   <XPREFIX>_LIBDIR     ... lib-dir of the module
+-#
+-#   <XPREFIX> = <PREFIX>  when |MODULES| == 1, else
+-#   <XPREFIX> = <PREFIX>_<MODNAME>
+-#
+-# A <MODULE> parameter can have the following formats:
+-#   {MODNAME}            ... matches any version
+-#   {MODNAME}>={VERSION} ... at least version <VERSION> is required
+-#   {MODNAME}={VERSION}  ... exactly version <VERSION> is required
+-#   {MODNAME}<={VERSION} ... modules must not be newer than <VERSION>
+-#
+-# Examples
+-#   pkg_check_modules (GLIB2   glib-2.0)
+-#
+-#   pkg_check_modules (GLIB2   glib-2.0>=2.10)
+-#     requires at least version 2.10 of glib2 and defines e.g.
+-#       GLIB2_VERSION=2.10.3
+-#
+-#   pkg_check_modules (FOO     glib-2.0>=2.10 gtk+-2.0)
+-#     requires both glib2 and gtk2, and defines e.g.
+-#       FOO_glib-2.0_VERSION=2.10.3
+-#       FOO_gtk+-2.0_VERSION=2.8.20
+-#
+-#   pkg_check_modules (XRENDER REQUIRED xrender)
+-#     defines e.g.:
+-#       XRENDER_LIBRARIES=Xrender;X11
+-#       XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
+-#
+-#   pkg_search_module (BAR     libxml-2.0 libxml2 libxml>=2)
+-
+-
+-# Copyright (C) 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
+-#
+-# Redistribution and use, with or without modification, are permitted
+-# provided that the following conditions are met:
+-# 
+-#    1. Redistributions must retain the above copyright notice, this
+-#       list of conditions and the following disclaimer.
+-#    2. The name of the author may not be used to endorse or promote
+-#       products derived from this software without specific prior
+-#       written permission.
+-# 
+-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-
+-
+-### Common stuff ####
+-set(PKG_CONFIG_VERSION 1)
+-set(PKG_CONFIG_FOUND   0)
+-
+-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
+-mark_as_advanced(PKG_CONFIG_EXECUTABLE)
+-
+-if(PKG_CONFIG_EXECUTABLE)
+-  set(PKG_CONFIG_FOUND 1)
+-endif(PKG_CONFIG_EXECUTABLE)
+-
+-
+-# Unsets the given variables
+-macro(_pkgconfig_unset var)
+-  set(${var} "" CACHE INTERNAL "")
+-endmacro(_pkgconfig_unset)
+-
+-macro(_pkgconfig_set var value)
+-  set(${var} ${value} CACHE INTERNAL "")
+-endmacro(_pkgconfig_set)
+-
+-# Invokes pkgconfig, cleans up the result and sets variables
+-macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
+-  set(_pkgconfig_invoke_result)
+-
+-  execute_process(
+-    COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist}
+-    OUTPUT_VARIABLE _pkgconfig_invoke_result
+-    RESULT_VARIABLE _pkgconfig_failed)
+-
+-  if (_pkgconfig_failed)
+-    set(_pkgconfig_${_varname} "")
+-    _pkgconfig_unset(${_prefix}_${_varname})
+-  else(_pkgconfig_failed)
+-    string(REGEX REPLACE "[\r\n]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+-    string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+-
+-    if (NOT ${_regexp} STREQUAL "")
+-      string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+-    endif(NOT ${_regexp} STREQUAL "")
+-
+-    separate_arguments(_pkgconfig_invoke_result)
+-
+-    #message(STATUS "  ${_varname} ... ${_pkgconfig_invoke_result}")
+-    set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result})
+-    _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}")
+-  endif(_pkgconfig_failed)
+-endmacro(_pkgconfig_invoke)
+-
+-# Invokes pkgconfig two times; once without '--static' and once with
+-# '--static'
+-macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp)
+-  _pkgconfig_invoke("${_pkglist}" ${_prefix}        ${_varname} "${cleanup_regexp}" ${ARGN})
+-  _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static  ${ARGN})
+-endmacro(_pkgconfig_invoke_dyn)
+-
+-# Splits given arguments into options and a package list
+-macro(_pkgconfig_parse_options _result _is_req)
+-  set(${_is_req} 0)
+-  
+-  foreach(_pkg ${ARGN})
+-    if (_pkg STREQUAL "REQUIRED")
+-      set(${_is_req} 1)
+-    endif (_pkg STREQUAL "REQUIRED")
+-  endforeach(_pkg ${ARGN})
+-
+-  set(${_result} ${ARGN})
+-  list(REMOVE_ITEM ${_result} "REQUIRED")
+-endmacro(_pkgconfig_parse_options)
+-
+-###
+-macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
+-  _pkgconfig_unset(${_prefix}_FOUND)
+-  _pkgconfig_unset(${_prefix}_VERSION)
+-  _pkgconfig_unset(${_prefix}_PREFIX)
+-  _pkgconfig_unset(${_prefix}_INCLUDEDIR)
+-  _pkgconfig_unset(${_prefix}_LIBDIR)
+-  _pkgconfig_unset(${_prefix}_LIBS)
+-  _pkgconfig_unset(${_prefix}_LIBS_L)
+-  _pkgconfig_unset(${_prefix}_LIBS_PATHS)
+-  _pkgconfig_unset(${_prefix}_LIBS_OTHER)
+-  _pkgconfig_unset(${_prefix}_CFLAGS)
+-  _pkgconfig_unset(${_prefix}_CFLAGS_I)
+-  _pkgconfig_unset(${_prefix}_CFLAGS_OTHER)
+-  _pkgconfig_unset(${_prefix}_STATIC_LIBDIR)
+-  _pkgconfig_unset(${_prefix}_STATIC_LIBS)
+-  _pkgconfig_unset(${_prefix}_STATIC_LIBS_L)
+-  _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS)
+-  _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER)
+-  _pkgconfig_unset(${_prefix}_STATIC_CFLAGS)
+-  _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I)
+-  _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER)
+-
+-  # create a better addressable variable of the modules and calculate its size
+-  set(_pkg_check_modules_list ${ARGN})
+-  list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt)
+-
+-  if(PKG_CONFIG_EXECUTABLE)
+-    # give out status message telling checked module
+-    if (NOT ${_is_silent})
+-      if (_pkg_check_modules_cnt EQUAL 1)
+-        message(STATUS "checking for module '${_pkg_check_modules_list}'")
+-      else(_pkg_check_modules_cnt EQUAL 1)
+-        message(STATUS "checking for modules '${_pkg_check_modules_list}'")
+-      endif(_pkg_check_modules_cnt EQUAL 1)
+-    endif(NOT ${_is_silent})
+-    
+-    set(_pkg_check_modules_packages)
+-    set(_pkg_check_modules_failed)
+-
+-    # iterate through module list and check whether they exist and match the required version
+-    foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list})
+-      set(_pkg_check_modules_exist_query)
+-
+-      # check whether version is given
+-      if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
+-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
+-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op   "${_pkg_check_modules_pkg}")
+-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver  "${_pkg_check_modules_pkg}")
+-      else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
+-        set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
+-        set(_pkg_check_modules_pkg_op)
+-        set(_pkg_check_modules_pkg_ver)
+-      endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
+-
+-      # handle the operands
+-      if (_pkg_check_modules_pkg_op STREQUAL ">=")
+-        list(APPEND _pkg_check_modules_exist_query --atleast-version)
+-      endif(_pkg_check_modules_pkg_op STREQUAL ">=")
+-
+-      if (_pkg_check_modules_pkg_op STREQUAL "=")
+-        list(APPEND _pkg_check_modules_exist_query --exact-version)
+-      endif(_pkg_check_modules_pkg_op STREQUAL "=")
+-      
+-      if (_pkg_check_modules_pkg_op STREQUAL "<=")
+-        list(APPEND _pkg_check_modules_exist_query --max-version)
+-      endif(_pkg_check_modules_pkg_op STREQUAL "<=")
+-
+-      # create the final query which is of the format:
+-      # * --atleast-version <version> <pkg-name>
+-      # * --exact-version <version> <pkg-name>      
+-      # * --max-version <version> <pkg-name>
+-      # * --exists <pkg-name>
+-      if (_pkg_check_modules_pkg_op)
+-        list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}")
+-      else(_pkg_check_modules_pkg_op)
+-        list(APPEND _pkg_check_modules_exist_query --exists)
+-      endif(_pkg_check_modules_pkg_op)
+-
+-      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION)
+-      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX)
+-      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR)
+-      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR)
+-
+-      list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}")
+-      list(APPEND _pkg_check_modules_packages    "${_pkg_check_modules_pkg_name}")
+-
+-      # execute the query
+-      execute_process(
+-        COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query}
+-        RESULT_VARIABLE _pkgconfig_retval)
+-
+-      # evaluate result and tell failures
+-      if (_pkgconfig_retval)
+-        if(NOT ${_is_silent})
+-          message(STATUS "  package '${_pkg_check_modules_pkg}' not found")
+-        endif(NOT ${_is_silent})
+-
+-        set(_pkg_check_modules_failed 1)
+-      endif(_pkgconfig_retval)
+-    endforeach(_pkg_check_modules_pkg)
+-
+-    if(_pkg_check_modules_failed)
+-      # fail when requested
+-      if (${_is_required})
+-        message(SEND_ERROR "A required package was not found")
+-      endif (${_is_required})
+-    else(_pkg_check_modules_failed)
+-      # when we are here, we checked whether requested modules
+-      # exist. Now, go through them and set variables
+-      
+-      _pkgconfig_set(${_prefix}_FOUND 1)
+-      list(LENGTH _pkg_check_modules_packages pkg_count)
+-
+-      # iterate through all modules again and set individual variables
+-      foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages})
+-        # handle case when there is only one package required
+-        if (pkg_count EQUAL 1)
+-          set(_pkg_check_prefix "${_prefix}")
+-        else(pkg_count EQUAL 1)
+-          set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}")
+-        endif(pkg_count EQUAL 1)
+-        
+-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION    ""   --modversion )
+-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX     ""   --variable=prefix )
+-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR ""   --variable=includedir )
+-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR     ""   --variable=libdir )
+-
+-        message(STATUS "  found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}")
+-      endforeach(_pkg_check_modules_pkg)
+-
+-      # set variables which are combined for multiple modules
+-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES           "(^| )-l" --libs-only-l )
+-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS        "(^| )-L" --libs-only-L )
+-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS             ""        --libs )
+-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER       ""        --libs-only-other )
+-
+-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS        "(^| )-I" --cflags-only-I )
+-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS              ""        --cflags )
+-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER        ""        --cflags-only-other )
+-    endif(_pkg_check_modules_failed)
+-  else(PKG_CONFIG_EXECUTABLE)
+-    if (${_is_required})
+-      message(SEND_ERROR "pkg-config tool not found")
+-    endif (${_is_required})
+-  endif(PKG_CONFIG_EXECUTABLE)
+-endmacro(_pkg_check_modules_internal)
+-
+-###
+-### User visible macros start here
+-###
+-
+-###
+-macro(pkg_check_modules _prefix _module0)
+-  # check cached value
+-  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
+-    _pkgconfig_parse_options   (_pkg_modules _pkg_is_required "${_module0}" ${ARGN})
+-    _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules})
+-
+-    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
+-  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
+-endmacro(pkg_check_modules)
+-
+-###
+-macro(pkg_search_module _prefix _module0)
+-  # check cached value
+-  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
+-    set(_pkg_modules_found 0)
+-    _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN})
+-
+-    message(STATUS "checking for one of the modules '${_pkg_modules_alt}'")
+-
+-    # iterate through all modules and stop at the first working one.
+-    foreach(_pkg_alt ${_pkg_modules_alt})
+-      if(NOT _pkg_modules_found)
+-        _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}")
+-      endif(NOT _pkg_modules_found)
+-
+-      if (${_prefix}_FOUND)
+-        set(_pkg_modules_found 1)
+-      endif(${_prefix}_FOUND)
+-    endforeach(_pkg_alt)
+-
+-    if (NOT ${_prefix}_FOUND)
+-      if(${_pkg_is_required})
+-        message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found")
+-      endif(${_pkg_is_required})
+-    endif(NOT ${_prefix}_FOUND)
+-    
+-    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
+-  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)  
+-endmacro(pkg_search_module)
+-
+-### Local Variables:
+-### mode: cmake
+-### End:
+--- a/cmake/modules/FindQt4.cmake
++++ /dev/null
+@@ -1,1379 +0,0 @@
+-# - Find QT 4
+-# This module can be used to find Qt4.
+-# The most important issue is that the Qt4 qmake is available via the system path.
+-# This qmake is then used to detect basically everything else.
+-# This module defines a number of key variables and macros. First is 
+-# QT_USE_FILE which is the path to a CMake file that can be included to compile
+-# Qt 4 applications and libraries.  By default, the QtCore and QtGui 
+-# libraries are loaded. This behavior can be changed by setting one or more 
+-# of the following variables to true:
+-#                    QT_DONT_USE_QTCORE
+-#                    QT_DONT_USE_QTGUI
+-#                    QT_USE_QT3SUPPORT
+-#                    QT_USE_QTASSISTANT
+-#                    QT_USE_QTDESIGNER
+-#                    QT_USE_QTMOTIF
+-#                    QT_USE_QTMAIN
+-#                    QT_USE_QTNETWORK
+-#                    QT_USE_QTNSPLUGIN
+-#                    QT_USE_QTOPENGL
+-#                    QT_USE_QTSQL
+-#                    QT_USE_QTXML
+-#                    QT_USE_QTSVG
+-#                    QT_USE_QTTEST
+-#                    QT_USE_QTUITOOLS
+-#                    QT_USE_QTDBUS
+-#                    QT_USE_QTSCRIPT
+-#                    QT_USE_QTASSISTANTCLIENT
+-#                    QT_USE_QTHELP
+-#                    QT_USE_QTWEBKIT
+-#                    QT_USE_QTXMLPATTERNS
+-#
+-# If you are using Qt4 via UseQt4.cmake instead of FIND_PACKAGE(Qt4), all the 
+-# libraries required are stored in the variable QT_LIBRARIES.
+-# Add this variable to your TARGET_LINK_LIBRARIES.  Includes and definitions
+-# needed for compiling Qt code are then already set up by including the QT_USE_FILE.
+-#  
+-#  macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
+-#        create moc code from a list of files containing Qt class with
+-#        the Q_OBJECT declaration.  Options may be given to moc, such as those found
+-#        when executing "moc -help"
+-#
+-#  macro QT4_WRAP_UI(outfiles inputfile ... OPTIONS ...)
+-#        create code from a list of Qt designer ui files.
+-#        Options may be given to uic, such as those found
+-#        when executing "uic -help"
+-#
+-#  macro QT4_ADD_RESOURCES(outfiles inputfile ... OPTIONS ...)
+-#        create code from a list of Qt resource files.
+-#        Options may be given to rcc, such as those found
+-#        when executing "rcc -help"
+-#
+-#  macro QT4_AUTOMOC(inputfile ... )
+-#  macro QT4_GENERATE_MOC(inputfile outputfile )
+-#
+-#  macro QT4_ADD_DBUS_INTERFACE(outfiles interface basename)
+-#        create a the interface header and implementation files with the 
+-#        given basename from the given interface xml file and add it to 
+-#        the list of sources.
+-#        To disable generating a namespace header, set the source file property 
+-#        NO_NAMESPACE to TRUE on the interface file.
+-#
+-#  macro QT4_ADD_DBUS_INTERFACES(outfiles inputfile ... )
+-#        create the interface header and implementation files 
+-#        for all listed interface xml files
+-#        the name will be automatically determined from the name of the xml file
+-#        To disable generating namespace headers, set the source file property 
+-#        NO_NAMESPACE to TRUE for these inputfiles.
+-#
+-#  macro QT4_ADD_DBUS_ADAPTOR(outfiles xmlfile parentheader parentclassname [basename] [classname])
+-#        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
+-#        forwards the calls to a parent class, defined in parentheader and named
+-#        parentclassname. The name of the generated files will be
+-#        <basename>adaptor.{cpp,h} where basename defaults to the basename of the xml file.
+-#        If <classname> is provided, then it will be used as the classname of the
+-#        adaptor itself.
+-#
+-#  macro QT4_GENERATE_DBUS_INTERFACE( header [interfacename] OPTIONS ...)
+-#        generate the xml interface file from the given header.
+-#        If the optional argument interfacename is omitted, the name of the 
+-#        interface file is constructed from the basename of the header with
+-#        the suffix .xml appended.
+-#        Options may be given to uic, such as those found when executing "qdbuscpp2xml --help"
+-#
+-#  QT_FOUND         If false, don't try to use Qt.
+-#  QT4_FOUND        If false, don't try to use Qt 4.
+-#
+-#  QT_QTCORE_FOUND        True if QtCore was found.
+-#  QT_QTGUI_FOUND         True if QtGui was found.
+-#  QT_QT3SUPPORT_FOUND    True if Qt3Support was found.
+-#  QT_QTASSISTANT_FOUND   True if QtAssistant was found.
+-#  QT_QTDBUS_FOUND        True if QtDBus was found.
+-#  QT_QTDESIGNER_FOUND    True if QtDesigner was found.
+-#  QT_QTDESIGNERCOMPONENTS True if QtDesignerComponents was found.
+-#  QT_QTMOTIF_FOUND       True if QtMotif was found.
+-#  QT_QTNETWORK_FOUND     True if QtNetwork was found.
+-#  QT_QTNSPLUGIN_FOUND    True if QtNsPlugin was found.
+-#  QT_QTOPENGL_FOUND      True if QtOpenGL was found.
+-#  QT_QTSQL_FOUND         True if QtSql was found.
+-#  QT_QTXML_FOUND         True if QtXml was found.
+-#  QT_QTSVG_FOUND         True if QtSvg was found.
+-#  QT_QTSCRIPT_FOUND      True if QtScript was found.
+-#  QT_QTTEST_FOUND        True if QtTest was found.
+-#  QT_QTUITOOLS_FOUND     True if QtUiTools was found.
+-#  QT_QTASSISTANTCLIENT_FOUND         True if QtAssistantClient was found.
+-#  QT_QTHELP_FOUND      True if QtHelp was found.
+-#  QT_QTWEBKIT_FOUND        True if QtWebKit was found.
+-#  QT_QTXMLPATTERNS_FOUND     True if QtXmlPatterns was found.
+-#                      
+-#  QT_DEFINITIONS   Definitions to use when compiling code that uses Qt.
+-#                  
+-#  QT_INCLUDES      List of paths to all include directories of 
+-#                   Qt4 QT_INCLUDE_DIR and QT_QTCORE_INCLUDE_DIR are
+-#                   always in this variable even if NOTFOUND,
+-#                   all other INCLUDE_DIRS are
+-#                   only added if they are found.
+-#   
+-#  QT_INCLUDE_DIR              Path to "include" of Qt4
+-#  QT_QT_INCLUDE_DIR           Path to "include/Qt" 
+-#  QT_QT3SUPPORT_INCLUDE_DIR   Path to "include/Qt3Support" 
+-#  QT_QTASSISTANT_INCLUDE_DIR  Path to "include/QtAssistant" 
+-#  QT_QTCORE_INCLUDE_DIR       Path to "include/QtCore"         
+-#  QT_QTDESIGNER_INCLUDE_DIR   Path to "include/QtDesigner" 
+-#  QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR   Path to "include/QtDesigner"
+-#  QT_QTDBUS_INCLUDE_DIR       Path to "include/QtDBus" 
+-#  QT_QTGUI_INCLUDE_DIR        Path to "include/QtGui" 
+-#  QT_QTMOTIF_INCLUDE_DIR      Path to "include/QtMotif" 
+-#  QT_QTNETWORK_INCLUDE_DIR    Path to "include/QtNetwork" 
+-#  QT_QTNSPLUGIN_INCLUDE_DIR   Path to "include/QtNsPlugin" 
+-#  QT_QTOPENGL_INCLUDE_DIR     Path to "include/QtOpenGL" 
+-#  QT_QTSQL_INCLUDE_DIR        Path to "include/QtSql" 
+-#  QT_QTXML_INCLUDE_DIR        Path to "include/QtXml" 
+-#  QT_QTSVG_INCLUDE_DIR        Path to "include/QtSvg"
+-#  QT_QTSCRIPT_INCLUDE_DIR     Path to "include/QtScript"
+-#  QT_QTTEST_INCLUDE_DIR       Path to "include/QtTest"
+-#  QT_QTASSISTANTCLIENT_INCLUDE_DIR Path to "include/QtAssistant"
+-#  QT_QTHELP_INCLUDE_DIR        Path to "include/QtHelp"
+-#  QT_QTWEBKIT_INCLUDE_DIR     Path to "include/QtWebKit"
+-#  QT_QTXMLPATTERNS_INCLUDE_DIR       Path to "include/QtXmlPatterns"
+-#                            
+-#  QT_LIBRARY_DIR              Path to "lib" of Qt4
+-# 
+-#  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.
+-#
+-# So there are the following variables:
+-# The Qt3Support library:     QT_QT3SUPPORT_LIBRARY
+-#
+-# The QtAssistant library:    QT_QTASSISTANT_LIBRARY
+-#
+-# The QtCore library:         QT_QTCORE_LIBRARY
+-#
+-# The QtDBus library:         QT_QTDBUS_LIBRARY
+-#
+-# The QtDesigner library:     QT_QTDESIGNER_LIBRARY
+-#
+-# The QtDesignerComponents library:     QT_QTDESIGNERCOMPONENTS_LIBRARY
+-#
+-# The QtGui library:          QT_QTGUI_LIBRARY
+-#
+-# The QtMotif library:        QT_QTMOTIF_LIBRARY
+-#
+-# The QtNetwork library:      QT_QTNETWORK_LIBRARY
+-#
+-# The QtNsPLugin library:     QT_QTNSPLUGIN_LIBRARY
+-#
+-# The QtOpenGL library:       QT_QTOPENGL_LIBRARY
+-#
+-# The QtSql library:          QT_QTSQL_LIBRARY
+-#
+-# The QtXml library:          QT_QTXML_LIBRARY
+-#
+-# The QtSvg library:          QT_QTSVG_LIBRARY
+-#
+-# The QtScript library:       QT_QTSCRIPT_LIBRARY
+-#
+-# The QtTest library:         QT_QTTEST_LIBRARY
+-#
+-# The qtmain library for Windows QT_QTMAIN_LIBRARY
+-#
+-# The QtUiTools library:      QT_QTUITOOLS_LIBRARY
+-
+-#
+-# The QtAssistantClient library:  QT_QTASSISTANTCLIENT_LIBRARY
+-#
+-# The QtHelp library:             QT_QTHELP_LIBRARY
+-#
+-# The QtWebKit library:           QT_QTWEBKIT_LIBRARY
+-#
+-# The QtXmlPatterns library:      QT_QTXMLPATTERNS_LIBRARY
+-
+-
+-
+-#  
+-# also defined, but NOT for general use are
+-#  QT_MOC_EXECUTABLE          Where to find the moc tool.
+-#  QT_UIC_EXECUTABLE          Where to find the uic tool.
+-#  QT_UIC3_EXECUTABLE         Where to find the uic3 tool.
+-#  QT_RCC_EXECUTABLE          Where to find the rcc tool
+-#  QT_DBUSCPP2XML_EXECUTABLE  Where to find the qdbuscpp2xml tool.
+-#  QT_DBUSXML2CPP_EXECUTABLE  Where to find the qdbusxml2cpp tool.
+-#  
+-#  QT_DOC_DIR                 Path to "doc" of Qt4
+-#  QT_MKSPECS_DIR             Path to "mkspecs" of Qt4
+-#
+-#
+-# These are around for backwards compatibility 
+-# they will be set
+-#  QT_WRAP_CPP  Set true if QT_MOC_EXECUTABLE is found
+-#  QT_WRAP_UI   Set true if QT_UIC_EXECUTABLE is found
+-#  
+-# These variables do _NOT_ have any effect anymore (compared to FindQt.cmake)
+-#  QT_MT_REQUIRED         Qt4 is now always multithreaded
+-#  
+-# These variables are set to "" Because Qt structure changed 
+-# (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.
+-
+-if (QT4_QMAKE_FOUND)
+-   # Check already done in this cmake run, nothing more to do
+-
+-else (QT4_QMAKE_FOUND)
+-
+-# check that QT_NO_DEBUG is defined for release configurations
+-MACRO(QT_CHECK_FLAG_EXISTS FLAG VAR DOC)
+-  IF(NOT ${VAR} MATCHES "${FLAG}")
+-    SET(${VAR} "${${VAR}} ${FLAG}" 
+-      CACHE STRING "Flags used by the compiler during ${DOC} builds." FORCE)
+-  ENDIF(NOT ${VAR} MATCHES "${FLAG}")
+-ENDMACRO(QT_CHECK_FLAG_EXISTS FLAG VAR)
+-QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_RELWITHDEBINFO "Release with Debug Info")
+-QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_RELEASE "release")
+-QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL "release minsize")
+-
+-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
+-MACRO(QT_QUERY_QMAKE outvar invar)
+-  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")
+-
+-  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
+-)
+-
+-IF (QT_QMAKE_EXECUTABLE)
+-
+-  SET(QT4_QMAKE_FOUND FALSE)
+-  
+-  EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
+-
+-  # check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path
+-  IF("${QTVERSION}" MATCHES "Unknown")
+-    SET(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE)
+-    FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES 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"
+-      $ENV{QTDIR}/bin
+-      )
+-    IF(QT_QMAKE_EXECUTABLE)
+-      EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} 
+-        ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
+-    ENDIF(QT_QMAKE_EXECUTABLE)
+-  ENDIF("${QTVERSION}" MATCHES "Unknown")
+-
+-  # check that we found the Qt4 qmake, Qt3 qmake output won't match here
+-  STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}")
+-  IF (qt_version_tmp)
+-
+-    # we need at least version 4.0.0
+-    IF (NOT QT_MIN_VERSION)
+-      SET(QT_MIN_VERSION "4.0.0")
+-    ENDIF (NOT QT_MIN_VERSION)
+-
+-    #now parse the parts of the user given version string into variables
+-    STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" req_qt_major_vers "${QT_MIN_VERSION}")
+-    IF (NOT req_qt_major_vers)
+-      MESSAGE( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", expected e.g. \"4.0.1\"")
+-    ENDIF (NOT req_qt_major_vers)
+-
+-    # now parse the parts of the user given version string into variables
+-    STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT_MIN_VERSION}")
+-    STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}")
+-    STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}")
+-
+-    IF (NOT req_qt_major_vers EQUAL 4)
+-      MESSAGE( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", major version 4 is required, e.g. \"4.0.1\"")
+-    ENDIF (NOT req_qt_major_vers EQUAL 4)
+-
+-    # and now the version string given by qmake
+-    STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" found_qt_major_vers "${QTVERSION}")
+-    STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" found_qt_minor_vers "${QTVERSION}")
+-    STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" found_qt_patch_vers "${QTVERSION}")
+-
+-    # compute an overall version number which can be compared at once
+-    MATH(EXPR req_vers "${req_qt_major_vers}*10000 + ${req_qt_minor_vers}*100 + ${req_qt_patch_vers}")
+-    MATH(EXPR found_vers "${found_qt_major_vers}*10000 + ${found_qt_minor_vers}*100 + ${found_qt_patch_vers}")
+-
+-    IF (found_vers LESS req_vers)
+-      SET(QT4_QMAKE_FOUND FALSE)
+-      SET(QT4_INSTALLED_VERSION_TOO_OLD TRUE)
+-    ELSE (found_vers LESS req_vers)
+-      SET(QT4_QMAKE_FOUND TRUE)
+-    ENDIF (found_vers LESS req_vers)
+-  ENDIF (qt_version_tmp)
+-
+-ENDIF (QT_QMAKE_EXECUTABLE)
+-
+-IF (QT4_QMAKE_FOUND)
+-
+-  if (WIN32)
+-    # get qt install dir 
+-    get_filename_component(_DIR ${QT_QMAKE_EXECUTABLE} PATH )
+-    get_filename_component(QT_INSTALL_DIR ${_DIR} PATH )
+-  endif (WIN32)
+-
+-  # ask qmake for the library dir
+-  # Set QT_LIBRARY_DIR
+-  IF (NOT QT_LIBRARY_DIR)
+-    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+-      ARGS "-query QT_INSTALL_LIBS"
+-      OUTPUT_VARIABLE QT_LIBRARY_DIR_TMP )
+-    IF(EXISTS "${QT_LIBRARY_DIR_TMP}")
+-      SET(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir")
+-    ELSE(EXISTS "${QT_LIBRARY_DIR_TMP}")
+-      MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}")
+-      MESSAGE("Warning: ${QT_LIBRARY_DIR_TMP} does NOT exist, Qt must NOT be installed correctly.")
+-    ENDIF(EXISTS "${QT_LIBRARY_DIR_TMP}")
+-  ENDIF(NOT QT_LIBRARY_DIR)
+-  
+-  IF (APPLE)
+-    IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+-      SET(QT_USE_FRAMEWORKS ON
+-        CACHE BOOL "Set to ON if Qt build uses frameworks.")
+-    ELSE (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+-      SET(QT_USE_FRAMEWORKS OFF
+-        CACHE BOOL "Set to ON if Qt build uses frameworks.")
+-    ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+-    
+-    MARK_AS_ADVANCED(QT_USE_FRAMEWORKS)
+-  ENDIF (APPLE)
+-  
+-  # ask qmake for the binary dir
+-  IF (NOT QT_BINARY_DIR)
+-     EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
+-        ARGS "-query QT_INSTALL_BINS"
+-        OUTPUT_VARIABLE qt_bins )
+-     SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
+-  ENDIF (NOT QT_BINARY_DIR)
+-
+-  # ask qmake for the include dir
+-  IF (NOT QT_HEADERS_DIR)
+-      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+-        ARGS "-query QT_INSTALL_HEADERS" 
+-        OUTPUT_VARIABLE qt_headers )
+-      SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
+-  ENDIF(NOT QT_HEADERS_DIR)
+-
+-
+-  # ask qmake for the documentation directory
+-  IF (NOT QT_DOC_DIR)
+-    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+-      ARGS "-query QT_INSTALL_DOCS"
+-      OUTPUT_VARIABLE qt_doc_dir )
+-    SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs")
+-  ENDIF (NOT QT_DOC_DIR)
+-
+-  # ask qmake for the mkspecs directory
+-  IF (NOT QT_MKSPECS_DIR)
+-    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+-      ARGS "-query QMAKE_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
+-  IF (NOT QT_PLUGINS_DIR)
+-    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+-      ARGS "-query QT_INSTALL_PLUGINS"
+-      OUTPUT_VARIABLE qt_plugins_dir )
+-    SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins")
+-  ENDIF (NOT QT_PLUGINS_DIR)
+-  ########################################
+-  #
+-  #       Setting the INCLUDE-Variables
+-  #
+-  ########################################
+-
+-  FIND_PATH(QT_QTCORE_INCLUDE_DIR QtGlobal
+-    ${QT_HEADERS_DIR}/QtCore
+-    ${QT_LIBRARY_DIR}/QtCore.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR}
+-  IF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
+-    IF (QT_USE_FRAMEWORKS)
+-      SET(QT_INCLUDE_DIR ${QT_HEADERS_DIR})
+-    ELSE (QT_USE_FRAMEWORKS)
+-      STRING( REGEX REPLACE "/QtCore$" "" qt4_include_dir ${QT_QTCORE_INCLUDE_DIR})
+-      SET( QT_INCLUDE_DIR ${qt4_include_dir} CACHE PATH "")
+-    ENDIF (QT_USE_FRAMEWORKS)
+-  ENDIF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
+-
+-  IF( NOT QT_INCLUDE_DIR)
+-    IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
+-      MESSAGE( FATAL_ERROR "Could NOT find QtGlobal header")
+-    ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
+-  ENDIF( NOT QT_INCLUDE_DIR)
+-
+-  #############################################
+-  #
+-  # Find out what window system we're using
+-  #
+-  #############################################
+-  # Save required includes and required_flags variables
+-  macro_push_required_vars()
+-  # 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
+-  IF( QT_USE_FRAMEWORKS )
+-    SET(CMAKE_REQUIRED_FLAGS "-F${QT_LIBRARY_DIR} ")
+-  ENDIF( QT_USE_FRAMEWORKS )
+-  # Check for Window system symbols (note: only one should end up being set)
+-  CHECK_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11)
+-  CHECK_SYMBOL_EXISTS(Q_WS_WIN "QtCore/qglobal.h" Q_WS_WIN)
+-  CHECK_SYMBOL_EXISTS(Q_WS_QWS "QtCore/qglobal.h" Q_WS_QWS)
+-  CHECK_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC)
+-
+-  IF (QT_QTCOPY_REQUIRED)
+-     CHECK_SYMBOL_EXISTS(QT_IS_QTCOPY "QtCore/qglobal.h" QT_KDE_QT_COPY)
+-     IF (NOT QT_IS_QTCOPY)
+-        MESSAGE(FATAL_ERROR "qt-copy is required, but hasn't been found")
+-     ENDIF (NOT QT_IS_QTCOPY)
+-  ENDIF (QT_QTCOPY_REQUIRED)
+-
+-  # Restore CMAKE_REQUIRED_INCLUDES+CMAKE_REQUIRED_FLAGS variables
+-  macro_pop_required_vars()
+-  #
+-  #############################################
+-
+-  IF (QT_USE_FRAMEWORKS)
+-    SET(QT_DEFINITIONS ${QT_DEFINITIONS} -F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR} )
+-  ENDIF (QT_USE_FRAMEWORKS)
+-
+-  # Set QT_QT3SUPPORT_INCLUDE_DIR
+-  FIND_PATH(QT_QT3SUPPORT_INCLUDE_DIR Qt3Support
+-    PATHS
+-    ${QT_INCLUDE_DIR}/Qt3Support
+-    ${QT_LIBRARY_DIR}/Qt3Support.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_QT_INCLUDE_DIR
+-  FIND_PATH(QT_QT_INCLUDE_DIR qglobal.h
+-    PATHS
+-    ${QT_INCLUDE_DIR}/Qt
+-    ${QT_LIBRARY_DIR}/QtCore.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_QTGUI_INCLUDE_DIR
+-  FIND_PATH(QT_QTGUI_INCLUDE_DIR QtGui
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtGui
+-    ${QT_LIBRARY_DIR}/QtGui.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_QTSVG_INCLUDE_DIR
+-  FIND_PATH(QT_QTSVG_INCLUDE_DIR QtSvg
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtSvg
+-    ${QT_LIBRARY_DIR}/QtSvg.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_QTSCRIPT_INCLUDE_DIR
+-  FIND_PATH(QT_QTSCRIPT_INCLUDE_DIR QtScript
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtScript
+-    ${QT_LIBRARY_DIR}/QtScript.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_QTTEST_INCLUDE_DIR
+-  FIND_PATH(QT_QTTEST_INCLUDE_DIR QtTest
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtTest
+-    ${QT_LIBRARY_DIR}/QtTest.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_QTUITOOLS_INCLUDE_DIR
+-  FIND_PATH(QT_QTUITOOLS_INCLUDE_DIR QtUiTools
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtUiTools
+-    ${QT_LIBRARY_DIR}/QtUiTools.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-
+-
+-  # Set QT_QTMOTIF_INCLUDE_DIR
+-  IF(Q_WS_X11)
+-    FIND_PATH(QT_QTMOTIF_INCLUDE_DIR QtMotif PATHS ${QT_INCLUDE_DIR}/QtMotif NO_DEFAULT_PATH )
+-  ENDIF(Q_WS_X11)
+-
+-  # Set QT_QTNETWORK_INCLUDE_DIR
+-  FIND_PATH(QT_QTNETWORK_INCLUDE_DIR QtNetwork
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtNetwork
+-    ${QT_LIBRARY_DIR}/QtNetwork.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_QTNSPLUGIN_INCLUDE_DIR
+-  FIND_PATH(QT_QTNSPLUGIN_INCLUDE_DIR QtNsPlugin
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtNsPlugin
+-    ${QT_LIBRARY_DIR}/QtNsPlugin.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_QTOPENGL_INCLUDE_DIR
+-  FIND_PATH(QT_QTOPENGL_INCLUDE_DIR QtOpenGL
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtOpenGL
+-    ${QT_LIBRARY_DIR}/QtOpenGL.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_QTSQL_INCLUDE_DIR
+-  FIND_PATH(QT_QTSQL_INCLUDE_DIR QtSql
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtSql
+-    ${QT_LIBRARY_DIR}/QtSql.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_QTXML_INCLUDE_DIR
+-  FIND_PATH(QT_QTXML_INCLUDE_DIR QtXml
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtXml
+-    ${QT_LIBRARY_DIR}/QtXml.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_QTASSISTANT_INCLUDE_DIR
+-  FIND_PATH(QT_QTASSISTANT_INCLUDE_DIR QtAssistant
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtAssistant
+-    ${QT_HEADERS_DIR}/QtAssistant
+-    ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_QTDESIGNER_INCLUDE_DIR
+-  FIND_PATH(QT_QTDESIGNER_INCLUDE_DIR QDesignerComponents
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtDesigner
+-    ${QT_HEADERS_DIR}/QtDesigner 
+-    ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
+-    NO_DEFAULT_PATH
+-    )
+-
+-  # Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR
+-  FIND_PATH(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR QDesignerComponents
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtDesigner
+-    ${QT_HEADERS_DIR}/QtDesigner
+-    NO_DEFAULT_PATH
+-    )
+-
+-
+-  # Set QT_QTDBUS_INCLUDE_DIR
+-  FIND_PATH(QT_QTDBUS_INCLUDE_DIR QtDBus
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtDBus
+-    ${QT_HEADERS_DIR}/QtDBus
+-    NO_DEFAULT_PATH
+-    )
+-  # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
+-  FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QtAssistantClient
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtAssistant
+-    ${QT_HEADERS_DIR}/QtAssistant
+-    NO_DEFAULT_PATH
+-    )
+-  # Set QT_QTHELP_INCLUDE_DIR
+-  FIND_PATH(QT_QTHELP_INCLUDE_DIR QtHelp
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtHelp
+-    ${QT_HEADERS_DIR}/QtHelp
+-    NO_DEFAULT_PATH
+-    )
+-  # Set QT_QTWEBKIT_INCLUDE_DIR
+-  FIND_PATH(QT_QTWEBKIT_INCLUDE_DIR QtWebKit
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtWebKit
+-    ${QT_HEADERS_DIR}/QtWebKit
+-    NO_DEFAULT_PATH
+-    )
+-  # Set QT_QTXMLPATTERNS_INCLUDE_DIR
+-  FIND_PATH(QT_QTXMLPATTERNS_INCLUDE_DIR QtXmlPatterns
+-    PATHS
+-    ${QT_INCLUDE_DIR}/QtXmlPatterns
+-    ${QT_HEADERS_DIR}/QtXmlPatterns
+-    NO_DEFAULT_PATH
+-    )
+-  # Make variables changeble to the advanced user
+-  MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR)
+-
+-  # Set QT_INCLUDES
+-  SET( QT_INCLUDES ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR})
+-
+-
+-  ########################################
+-  #
+-  #       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)
+-
+-    IF(EXISTS ${QT_LIBRARY_DIR}/QtAssistantClient.framework)
+-      SET(QT_QTASSISTANTCLIENT_FOUND TRUE)
+-      SET(QT_QTASSISTANTCLIENT_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtAssistantClient" CACHE STRING "The QtAssistantClient library.")
+-    ELSE(EXISTS ${QT_LIBRARY_DIR}/QtAssistantClient.framework)
+-      SET(QT_QTASSISTANTCLIENT_FOUND FALSE)
+-    ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtAssistantClient.framework)
+-
+-    IF(EXISTS ${QT_LIBRARY_DIR}/QtWebKit.framework)
+-      SET(QT_QTWEBKIT_FOUND TRUE)
+-      SET(QT_QTWEBKIT_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtWebKit" CACHE STRING "The QtWebKit library.")
+-    ELSE(EXISTS ${QT_LIBRARY_DIR}/QtWebKit.framework)
+-      SET(QT_QTWEBKIT_FOUND FALSE)
+-    ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtWebKit.framework)
+-
+-    IF(EXISTS ${QT_LIBRARY_DIR}/QtXmlPatterns.framework)
+-      SET(QT_QTXMLPATTERNS_FOUND TRUE)
+-      SET(QT_QTXMLPATTERNS_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtXmlPatterns" CACHE STRING "The QtXmlPatterns library.")
+-    ELSE(EXISTS ${QT_LIBRARY_DIR}/QtXmlPatterns.framework)
+-      SET(QT_QTXMLPATTERNS_FOUND FALSE)
+-    ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtXmlPatterns.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 QtCore_debug         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
+-
+-    # Set QT_QT3SUPPORT_LIBRARY
+-    FIND_LIBRARY(QT_QT3SUPPORT_LIBRARY NAMES Qt3Support Qt3Support_debug Qt3Support4 Qt3Supportd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    # Set QT_QTGUI_LIBRARY
+-    FIND_LIBRARY(QT_QTGUI_LIBRARY NAMES QtGui QtGui_debug QtGui_debug QtGui4 QtGuid4            PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    # Set QT_QTMOTIF_LIBRARY
+-    IF(Q_WS_X11)
+-      FIND_LIBRARY(QT_QTMOTIF_LIBRARY NAMES QtMotif  QtMotif_debug PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-    ENDIF(Q_WS_X11)
+-
+-    # Set QT_QTNETWORK_LIBRARY
+-    FIND_LIBRARY(QT_QTNETWORK_LIBRARY NAMES QtNetwork QtNetwork_debug QtNetwork4 QtNetworkd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    # Set QT_QTNSPLUGIN_LIBRARY
+-    FIND_LIBRARY(QT_QTNSPLUGIN_LIBRARY NAMES QtNsPlugin QtNsPlugin_debug PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    # Set QT_QTOPENGL_LIBRARY
+-    FIND_LIBRARY(QT_QTOPENGL_LIBRARY NAMES QtOpenGL QtOpenGL_debug QtOpenGL4 QtOpenGLd4    PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    # Set QT_QTSQL_LIBRARY
+-    FIND_LIBRARY(QT_QTSQL_LIBRARY NAMES QtSql QtSql_debug QtSql4 QtSqld4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    # Set QT_QTXML_LIBRARY
+-    FIND_LIBRARY(QT_QTXML_LIBRARY NAMES QtXml QtXml_debug QtXml4 QtXmld4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    # Set QT_QTSVG_LIBRARY
+-    FIND_LIBRARY(QT_QTSVG_LIBRARY NAMES QtSvg QtSvg_debug QtSvg4 QtSvgd4       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    # Set QT_QTSCRIPT_LIBRARY
+-    FIND_LIBRARY(QT_QTSCRIPT_LIBRARY NAMES QtScript QtScript_debug QtScript4 QtScriptd4   PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    # Set QT_QTUITOOLS_LIBRARY
+-    FIND_LIBRARY(QT_QTUITOOLS_LIBRARY NAMES QtUiTools QtUiTools_debug QtUiTools4 QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    # Set QT_QTTEST_LIBRARY
+-    FIND_LIBRARY(QT_QTTEST_LIBRARY NAMES QtTest QtTest_debug QtTest4 QtTestd4          PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    FIND_LIBRARY(QT_QTDBUS_LIBRARY NAMES QtDBus QtDBus_debug QtDBus4 QtDBusd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY NAMES QtAssistantClient QtAssistantClient_debug QtAssistantClient4 QtAssistantClientd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    FIND_LIBRARY(QT_QTHELP_LIBRARY NAMES QtHelp QtHelp_debug QtHelp4 QtHelpd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    FIND_LIBRARY(QT_QTWEBKIT_LIBRARY NAMES QtWebKit QtWebKit_debug QtWebKit4 QtWebKitd4         PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-    FIND_LIBRARY(QT_QTXMLPATTERNS_LIBRARY NAMES QtXmlPatterns QtXmlPatterns_debug QtXmlPatterns4 QtXmlPatternsd4         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)
+-
+-  IF( NOT QT_QTCORE_LIBRARY )
+-    IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
+-      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 )
+-
+-  # Set QT_QTASSISTANT_LIBRARY
+-  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY NAMES QtAssistantClient QtAssistantClient4 QtAssistant QtAssistant4 QtAssistantd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+-
+-  # Set QT_QTDESIGNER_LIBRARY
+-  FIND_LIBRARY(QT_QTDESIGNER_LIBRARY NAMES QtDesigner QtDesigner_debug QtDesigner4 QtDesignerd4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+-
+-  # Set QT_QTDESIGNERCOMPONENTS_LIBRARY
+-  FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY NAMES QtDesignerComponents QtDesignerComponents_debug QtDesignerComponents4 QtDesignerComponentsd4 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)
+-  ENDIF(WIN32)
+-
+-  ############################################
+-  #
+-  # Check the existence of the libraries.
+-  #
+-  ############################################
+-
+-  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)
+-
+-        # 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)
+-
+-      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)
+-    
+-    IF (QT_${basename}_INCLUDE_DIR)
+-      #add the include directory to QT_INCLUDES
+-      SET(QT_INCLUDES "${QT_${basename}_INCLUDE_DIR}" ${QT_INCLUDES})
+-    ENDIF (QT_${basename}_INCLUDE_DIR)
+-
+-    # Make variables changeble to the advanced user
+-    MARK_AS_ADVANCED(QT_${basename}_LIBRARY QT_${basename}_INCLUDE_DIR)
+-  ENDMACRO (_QT4_ADJUST_LIB_VARS)
+-
+-
+-  # Set QT_xyz_LIBRARY variable and add 
+-  # library include path to QT_INCLUDES
+-  _QT4_ADJUST_LIB_VARS(QTCORE)
+-  _QT4_ADJUST_LIB_VARS(QTGUI)
+-  _QT4_ADJUST_LIB_VARS(QT3SUPPORT)
+-  _QT4_ADJUST_LIB_VARS(QTASSISTANT)
+-  _QT4_ADJUST_LIB_VARS(QTDESIGNER)
+-  _QT4_ADJUST_LIB_VARS(QTDESIGNERCOMPONENTS)
+-  _QT4_ADJUST_LIB_VARS(QTNETWORK)
+-  _QT4_ADJUST_LIB_VARS(QTNSPLUGIN)
+-  _QT4_ADJUST_LIB_VARS(QTOPENGL)
+-  _QT4_ADJUST_LIB_VARS(QTSQL)
+-  _QT4_ADJUST_LIB_VARS(QTXML)
+-  _QT4_ADJUST_LIB_VARS(QTSVG)
+-  _QT4_ADJUST_LIB_VARS(QTSCRIPT)
+-  _QT4_ADJUST_LIB_VARS(QTUITOOLS)
+-  _QT4_ADJUST_LIB_VARS(QTTEST)
+-  _QT4_ADJUST_LIB_VARS(QTDBUS)
+-  _QT4_ADJUST_LIB_VARS(QTWEBKIT)
+-  _QT4_ADJUST_LIB_VARS(QTASSISTANTCLIENT)
+-  _QT4_ADJUST_LIB_VARS(QTHELP)
+-  _QT4_ADJUST_LIB_VARS(QTXMLPATTERNS)
+-
+-  # platform dependent libraries
+-  IF(Q_WS_X11)
+-    _QT4_ADJUST_LIB_VARS(QTMOTIF)
+-  ENDIF(Q_WS_X11)
+-  IF(WIN32)
+-    _QT4_ADJUST_LIB_VARS(QTMAIN)
+-  ENDIF(WIN32)
+-  
+-
+-  #######################################
+-  #
+-  #       Check the executables of Qt 
+-  #          ( moc, uic, rcc )
+-  #
+-  #######################################
+-
+-
+-  # find moc and uic using qmake
+-  QT_QUERY_QMAKE(QT_MOC_EXECUTABLE_INTERNAL "QMAKE_MOC")
+-  QT_QUERY_QMAKE(QT_UIC_EXECUTABLE_INTERNAL "QMAKE_UIC")
+-
+-  FILE(TO_CMAKE_PATH 
+-    "${QT_MOC_EXECUTABLE_INTERNAL}" QT_MOC_EXECUTABLE_INTERNAL)
+-  FILE(TO_CMAKE_PATH 
+-    "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)
+-
+-  SET(QT_MOC_EXECUTABLE 
+-    ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
+-  SET(QT_UIC_EXECUTABLE 
+-    ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
+-
+-  FIND_PROGRAM(QT_UIC3_EXECUTABLE
+-    NAMES uic3
+-    PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
+-    )
+-
+-  FIND_PROGRAM(QT_RCC_EXECUTABLE 
+-    NAMES rcc
+-    PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
+-    )
+-
+-  FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE 
+-    NAMES qdbuscpp2xml
+-    PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
+-    )
+-
+-  FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE 
+-    NAMES qdbusxml2cpp
+-    PATHS ${QT_BINARY_DIR}
+-    NO_DEFAULT_PATH
+-    )
+-
+-  IF (QT_MOC_EXECUTABLE)
+-     SET(QT_WRAP_CPP "YES")
+-  ENDIF (QT_MOC_EXECUTABLE)
+-
+-  IF (QT_UIC_EXECUTABLE)
+-     SET(QT_WRAP_UI "YES")
+-  ENDIF (QT_UIC_EXECUTABLE)
+-
+-
+-
+-  MARK_AS_ADVANCED( QT_UIC_EXECUTABLE QT_UIC3_EXECUTABLE QT_MOC_EXECUTABLE QT_RCC_EXECUTABLE QT_DBUSXML2CPP_EXECUTABLE QT_DBUSCPP2XML_EXECUTABLE)
+-
+-  ######################################
+-  #
+-  #       Macros for building Qt files
+-  #
+-  ######################################
+-  MACRO (QT4_EXTRACT_OPTIONS _qt4_files _qt4_options)
+-    SET(${_qt4_files})
+-    SET(${_qt4_options})
+-    SET(_QT4_DOING_OPTIONS FALSE)
+-    FOREACH(_currentArg ${ARGN})
+-       IF ("${_currentArg}" STREQUAL "OPTIONS")
+-          SET(_QT4_DOING_OPTIONS TRUE)
+-       ELSE ("${_currentArg}" STREQUAL "OPTIONS")
+-          IF(_QT4_DOING_OPTIONS)
+-             LIST(APPEND ${_qt4_options} "${_currentArg}")
+-          ELSE(_QT4_DOING_OPTIONS)
+-             LIST(APPEND ${_qt4_files} "${_currentArg}")
+-          ENDIF(_QT4_DOING_OPTIONS)
+-       ENDIF ("${_currentArg}" STREQUAL "OPTIONS")
+-    ENDFOREACH(_currentArg)
+-  ENDMACRO (QT4_EXTRACT_OPTIONS)
+-
+-  MACRO (QT4_GET_MOC_INC_DIRS _moc_INC_DIRS)
+-     SET(${_moc_INC_DIRS})
+-     GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
+-
+-     FOREACH(_current ${_inc_DIRS})
+-        SET(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current})
+-     ENDFOREACH(_current ${_inc_DIRS})
+-
+-  ENDMACRO(QT4_GET_MOC_INC_DIRS)
+-
+-
+-  MACRO (QT4_GENERATE_MOC infile outfile )
+-  # get include dirs
+-     QT4_GET_MOC_INC_DIRS(moc_includes)
+-
+-     GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
+-
+-     IF (MSVC_IDE)
+-        SET (_moc_parameter_file ${outfile}_parameters)
+-        SET (_moc_param "${moc_includes} \n-o${outfile} \n${abs_infile}")
+-        STRING(REGEX REPLACE ";-I;" "\\n-I" _moc_param "${_moc_param}")
+-        FILE (WRITE ${_moc_parameter_file} "${_moc_param}")
+-        ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+-          COMMAND ${QT_MOC_EXECUTABLE}
+-          ARGS @"${_moc_parameter_file}"
+-          DEPENDS ${abs_infile})
+-     ELSE (MSVC_IDE)     
+-        ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+-           COMMAND ${QT_MOC_EXECUTABLE}
+-           ARGS ${moc_includes} -o ${outfile} ${abs_infile}
+-           DEPENDS ${abs_infile})     
+-     ENDIF (MSVC_IDE)
+-
+-     SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
+-
+-     MACRO_ADD_FILE_DEPENDENCIES(${abs_infile} ${outfile})
+-  ENDMACRO (QT4_GENERATE_MOC)
+-
+-
+-  # 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 ${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} ${moc_options} -o ${outfile} ${it}
+-        DEPENDS ${it})
+-      SET(${outfiles} ${${outfiles}} ${outfile})
+-    ENDFOREACH(it)
+-
+-  ENDMACRO (QT4_WRAP_CPP)
+-
+-
+-  # QT4_WRAP_UI(outfiles inputfile ... )
+-
+-  MACRO (QT4_WRAP_UI outfiles )
+-    QT4_EXTRACT_OPTIONS(ui_files ui_options ${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 ${ui_options} -o ${outfile} ${infile}
+-        MAIN_DEPENDENCY ${infile})
+-      SET(${outfiles} ${${outfiles}} ${outfile})
+-    ENDFOREACH (it)
+-
+-  ENDMACRO (QT4_WRAP_UI)
+-
+-
+-  # 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 ${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 
+-      #  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}")
+-        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 ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
+-        MAIN_DEPENDENCY ${infile}
+-        DEPENDS ${_RC_DEPENDS})
+-      SET(${outfiles} ${${outfiles}} ${outfile})
+-    ENDFOREACH (it)
+-
+-  ENDMACRO (QT4_ADD_RESOURCES)
+-
+-  MACRO(QT4_ADD_DBUS_INTERFACE _sources _interface _basename)
+-    GET_FILENAME_COMPONENT(_infile ${_interface} ABSOLUTE)
+-    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 ${_interface} NO_NAMESPACE)
+-    IF ( _nonamespace )
+-        SET(_params -N -m)
+-    ELSE ( _nonamespace )
+-        SET(_params -m)
+-    ENDIF ( _nonamespace )
+-
+-    GET_SOURCE_FILE_PROPERTY(_include ${_interface} INCLUDE)
+-    IF ( _include )
+-        SET(_params ${_params} -i ${_include})
+-    ENDIF ( _include )
+-
+-    ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
+-        COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} -p ${_basename} ${_infile}
+-        DEPENDS ${_infile})
+-  
+-    SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
+-    
+-    QT4_GENERATE_MOC(${_header} ${_moc})
+-  
+-    SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc})
+-    MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc})
+-  
+-  ENDMACRO(QT4_ADD_DBUS_INTERFACE)
+-  
+-  
+-  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)
+-     ENDFOREACH (_current_FILE)
+-  ENDMACRO(QT4_ADD_DBUS_INTERFACES)
+-  
+-  
+-  MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName OPTIONS -some -options )
+-    QT4_EXTRACT_OPTIONS(_customName _qt4_dbus_options ${ARGN})
+-
+-    GET_FILENAME_COMPONENT(_in_file ${_header} ABSOLUTE)
+-    GET_FILENAME_COMPONENT(_basename ${_header} NAME_WE)
+-
+-    IF (_customName)
+-      SET(_target ${CMAKE_CURRENT_BINARY_DIR}/${_customName})
+-    ELSE (_customName)
+-      SET(_target ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.xml)
+-    ENDIF (_customName)
+-  
+-    ADD_CUSTOM_COMMAND(OUTPUT ${_target}
+-        COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_qt4_dbus_options} ${_in_file} > ${_target}
+-        DEPENDS ${_in_file}
+-    )
+-  ENDMACRO(QT4_GENERATE_DBUS_INTERFACE)
+-  
+-  
+-  MACRO(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename _optionalClassName)
+-    GET_FILENAME_COMPONENT(_infile ${_xml_file} ABSOLUTE)
+-    
+-    SET(_optionalBasename "${ARGV4}")
+-    IF (_optionalBasename)
+-       SET(_basename ${_optionalBasename} )
+-    ELSE (_optionalBasename)
+-       STRING(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2adaptor" _basename ${_infile})
+-       STRING(TOLOWER ${_basename} _basename)
+-    ENDIF (_optionalBasename)
+-
+-    SET(_optionalClassName "${ARGV5}")
+-    SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
+-    SET(_impl   ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
+-    SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
+-
+-    IF(_optionalClassName)
+-       ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
+-          COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile}
+-          DEPENDS ${_infile}
+-        )
+-    ELSE(_optionalClassName)
+-       ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
+-          COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -a ${_basename} -i ${_include} -l ${_parentClass} ${_infile}
+-          DEPENDS ${_infile}
+-        )
+-    ENDIF(_optionalClassName)
+-
+-    QT4_GENERATE_MOC(${_header} ${_moc})
+-    SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
+-    MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc})
+-
+-    SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc})
+-  ENDMACRO(QT4_ADD_DBUS_ADAPTOR)
+-
+-   MACRO(QT4_AUTOMOC)
+-      QT4_GET_MOC_INC_DIRS(_moc_INCS)
+-
+-      SET(_matching_FILES )
+-      FOREACH (_current_FILE ${ARGN})
+-
+-         GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
+-         # if "SKIP_AUTOMOC" is set to true, we will not handle this file here.
+-         # here. this is required to make bouic work correctly:
+-         # we need to add generated .cpp files to the sources (to compile them),
+-         # but we cannot let automoc handle them, as the .cpp files don't exist yet when
+-         # cmake is run for the very first time on them -> however the .cpp files might
+-         # exist at a later run. at that time we need to skip them, so that we don't add two
+-         # different rules for the same moc file
+-         GET_SOURCE_FILE_PROPERTY(_skip ${_abs_FILE} SKIP_AUTOMOC)
+-
+-         IF ( NOT _skip AND EXISTS ${_abs_FILE} )
+-
+-            FILE(READ ${_abs_FILE} _contents)
+-
+-            GET_FILENAME_COMPONENT(_abs_PATH ${_abs_FILE} PATH)
+-
+-            STRING(REGEX MATCHALL "#include +[^ ]+\\.moc[\">]" _match "${_contents}")
+-            IF(_match)
+-               FOREACH (_current_MOC_INC ${_match})
+-                  STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
+-
+-                  GET_filename_component(_basename ${_current_MOC} NAME_WE)
+-   #               SET(_header ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.h)
+-                  SET(_header ${_abs_PATH}/${_basename}.h)
+-                  SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
+-                  ADD_CUSTOM_COMMAND(OUTPUT ${_moc}
+-                     COMMAND ${QT_MOC_EXECUTABLE}
+-                     ARGS ${_moc_INCS} ${_header} -o ${_moc}
+-                     DEPENDS ${_header}
+-                  )
+-
+-                  MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
+-               ENDFOREACH (_current_MOC_INC)
+-            ENDIF(_match)
+-         ENDIF ( NOT _skip AND EXISTS ${_abs_FILE} )
+-      ENDFOREACH (_current_FILE)
+-   ENDMACRO(QT4_AUTOMOC)
+-
+-
+-
+-  ######################################
+-  #
+-  #       decide if Qt got found
+-  #
+-  ######################################
+-
+-  # if the includes,libraries,moc,uic and rcc are found then we have it
+-  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)
+-      MESSAGE(STATUS "Found Qt-Version ${QTVERSION} (using ${QT_QMAKE_EXECUTABLE})")
+-    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)
+-  SET(QT_FOUND ${QT4_FOUND})
+-
+-
+-  #######################################
+-  #
+-  #       System dependent settings  
+-  #
+-  #######################################
+-  # 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)
+-
+-
+-  #######################################
+-  #
+-  #       compatibility settings 
+-  #
+-  #######################################
+-  # Backwards compatibility for CMake1.4 and 1.2
+-  SET (QT_MOC_EXE ${QT_MOC_EXECUTABLE} )
+-  SET (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
+-
+-  SET( QT_QT_LIBRARY "")
+-
+-ELSE(QT4_QMAKE_FOUND)
+-   
+-   SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
+-   IF(Qt4_FIND_REQUIRED)
+-      IF(QT4_INSTALLED_VERSION_TOO_OLD)
+-         MESSAGE(FATAL_ERROR "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required")
+-      ELSE(QT4_INSTALLED_VERSION_TOO_OLD)
+-         MESSAGE( FATAL_ERROR "Qt qmake not found!")
+-      ENDIF(QT4_INSTALLED_VERSION_TOO_OLD)
+-   ELSE(Qt4_FIND_REQUIRED)
+-      IF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY)
+-         MESSAGE(STATUS "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required")
+-      ENDIF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY)
+-   ENDIF(Qt4_FIND_REQUIRED)
+- 
+-ENDIF (QT4_QMAKE_FOUND)
+-ENDIF (QT4_QMAKE_FOUND)
+-
+--- a/cmake/modules/PkgConfigGetVar.cmake
++++ /dev/null
+@@ -1,32 +0,0 @@
+-include(UsePkgConfig)
+- 
+-MACRO(PKGCONFIG_GETVAR _package _var _output_variable)
+-  SET(${_output_variable})
+- 
+-  # if pkg-config has been found
+-  IF(PKGCONFIG_EXECUTABLE)
+- 
+-    EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
+- 
+-    # and if the package of interest also exists for pkg-config, then get the information
+-    IF(NOT _return_VALUE)
+- 
+-      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable ${_var} OUTPUT_VARIABLE ${_output_variable} )
+- 
+-    ENDIF(NOT _return_VALUE)
+- 
+-  ENDIF(PKGCONFIG_EXECUTABLE)
+- 
+-ENDMACRO(PKGCONFIG_GETVAR _package _var _output_variable)
+- 
+-macro(dbus_add_activation_service _sources)
+-    #PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir)
+-    foreach (_i ${_sources})
+-        get_filename_component(_service_file ${_i} ABSOLUTE)
+-        string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
+-        set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_output_file})
+-        configure_file(${_service_file} ${_target})
+-        install(FILES ${_target} DESTINATION ${DBUS_SERVICES_INSTALL_DIR} )
+-        #install(FILES ${_target} DESTINATION ${_install_dir})
+-    endforeach (_i ${ARGN})
+-endmacro(dbus_add_activation_service _sources) 
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@ find_package(Automoc4 REQUIRED)
+ 
+ include (${QT_USE_FILE})
+ include (FindPkgConfig)
+-include (PkgConfigGetVar)
+ include (InstallSettings)
+ 
+ pkg_check_modules (POLKIT REQUIRED polkit>=0.8)
+--- a/cmake/modules/FindPolkitQt.cmake
++++ b/cmake/modules/FindPolkitQt.cmake
+@@ -76,10 +76,7 @@ ENDIF (POLKITQT_FOUND)
+ 
+ MARK_AS_ADVANCED(POLKITQT_INCLUDE_DIR POLKITQT_LIB)
+ 
+-include (PkgConfigGetVar)
+-
+ macro(dbus_add_activation_system_service _sources)
+-    #PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir)
+     foreach (_i ${_sources})
+         get_filename_component(_service_file ${_i} ABSOLUTE)
+         string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -43,7 +43,6 @@ target_link_libraries(polkit-example
+ 
+ # This macro is defined in FindPolkitQt.cmake
+ macro(dbus_add_activation_system_service _sources)
+-    #PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir)
+     foreach (_i ${_sources})
+         get_filename_component(_service_file ${_i} ABSOLUTE)
+         string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})

Added: trunk/packages/polkit-qt/debian/patches/series
===================================================================
--- trunk/packages/polkit-qt/debian/patches/series	                        (rev 0)
+++ trunk/packages/polkit-qt/debian/patches/series	2009-04-14 11:39:05 UTC (rev 14395)
@@ -0,0 +1 @@
+01_remove_cmake_modules.diff

Modified: trunk/packages/polkit-qt/debian/rules
===================================================================
--- trunk/packages/polkit-qt/debian/rules	2009-04-14 10:38:02 UTC (rev 14394)
+++ trunk/packages/polkit-qt/debian/rules	2009-04-14 11:39:05 UTC (rev 14395)
@@ -3,11 +3,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 # shared library versions, option 1
 version=0.9.2
 major=0
 
-builddir/Makefile:
+builddir/Makefile: $(QUILT_STAMPFN)
 	dh_testdir
 
 	mkdir -p builddir
@@ -27,7 +29,7 @@
 
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp




More information about the pkg-kde-commits mailing list