Imported Upstream version 0.11.10 upstream upstream/0.11.10
authorTizenOpenSource <tizenopensrc@samsung.com>
Thu, 9 Jan 2025 02:51:51 +0000 (11:51 +0900)
committerTizenOpenSource <tizenopensrc@samsung.com>
Thu, 9 Jan 2025 02:51:51 +0000 (11:51 +0900)
82 files changed:
.github/workflows/cmake.yml
CMakeLists.txt
ChangeLog
RELEASE
THANKS
cmake/CMakeLists.txt
cmake/libwbxml2-config.cmake.in [new file with mode: 0644]
cmake/modules/FindBONOBO2.cmake [deleted file]
cmake/modules/FindBONOBOACTIVATION2.cmake [deleted file]
cmake/modules/FindBlueZ.cmake [deleted file]
cmake/modules/FindCheck.cmake [deleted file]
cmake/modules/FindEBook1.0.cmake [deleted file]
cmake/modules/FindEBook1.2.cmake [deleted file]
cmake/modules/FindECal1.0.cmake [deleted file]
cmake/modules/FindECal1.2.cmake [deleted file]
cmake/modules/FindEDataBook1.0.cmake [deleted file]
cmake/modules/FindEDataBook1.2.cmake [deleted file]
cmake/modules/FindEDataCal1.0.cmake [deleted file]
cmake/modules/FindEDataCal1.2.cmake [deleted file]
cmake/modules/FindEDataServer1.0.cmake [deleted file]
cmake/modules/FindEDataServer1.2.cmake [deleted file]
cmake/modules/FindEPackage.cmake [deleted file]
cmake/modules/FindEvolutionDataServer1.0.cmake [deleted file]
cmake/modules/FindEvolutionDataServer1.2.cmake [deleted file]
cmake/modules/FindExpat.cmake [deleted file]
cmake/modules/FindGConf2.cmake [deleted file]
cmake/modules/FindGLIB2.cmake [deleted file]
cmake/modules/FindGMODULE2.cmake [deleted file]
cmake/modules/FindGNOKII.cmake [deleted file]
cmake/modules/FindGNUTLS.cmake [deleted file]
cmake/modules/FindGOBJECT2.cmake [deleted file]
cmake/modules/FindGTHREAD2.cmake [deleted file]
cmake/modules/FindGTK2.cmake [deleted file]
cmake/modules/FindGnomeVfs2.cmake [deleted file]
cmake/modules/FindIconv.cmake [deleted file]
cmake/modules/FindKDEPIM3.cmake [deleted file]
cmake/modules/FindLibDbus.cmake [deleted file]
cmake/modules/FindLibDbusGlib.cmake [deleted file]
cmake/modules/FindLibExslt.cmake [deleted file]
cmake/modules/FindLibGCrypt.cmake [deleted file]
cmake/modules/FindLibGSSAPIV2.cmake [deleted file]
cmake/modules/FindLibGcal.cmake [deleted file]
cmake/modules/FindLibGlade.cmake [deleted file]
cmake/modules/FindLibGnome2.cmake [deleted file]
cmake/modules/FindLibLdap.cmake [deleted file]
cmake/modules/FindLibMozLdap.cmake [deleted file]
cmake/modules/FindLibNeon.cmake [deleted file]
cmake/modules/FindLibSASL2.cmake [deleted file]
cmake/modules/FindLibSoup2.cmake [deleted file]
cmake/modules/FindLibSyncMl.cmake [deleted file]
cmake/modules/FindLibUuid.cmake [deleted file]
cmake/modules/FindLibWbxml2.cmake [deleted file]
cmake/modules/FindLibXml2.cmake [deleted file]
cmake/modules/FindLibXslt.cmake [deleted file]
cmake/modules/FindORBit2.cmake [deleted file]
cmake/modules/FindOpenObex.cmake [deleted file]
cmake/modules/FindOpenSync.cmake [deleted file]
cmake/modules/FindPilotLink.cmake [deleted file]
cmake/modules/FindPkgConfig.cmake [deleted file]
cmake/modules/FindPythonLibs.cmake [deleted file]
cmake/modules/FindQt4.cmake [deleted file]
cmake/modules/FindSWIG.cmake [deleted file]
cmake/modules/FindSqlite.cmake [deleted file]
cmake/modules/FindSqlite3.cmake [deleted file]
cmake/modules/FindThunderbirdXpcom.cmake [deleted file]
cmake/modules/Testing.cmake [deleted file]
src/wbxml_buffers.c
src/wbxml_errors.c
src/wbxml_errors.h
src/wbxml_parser.c
src/wbxml_tables.c
src/wbxml_tree.c
src/wbxml_tree_clb_xml.c
test/api/CMakeLists.txt
test/api/test_wbxml_encoder_internals.c
test/fuzz/CMakeLists.txt [new file with mode: 0644]
test/fuzz/SIGABRT.PC.fffff7db0a10.STACK.0.CODE.-6.ADDR.0.INSTR.cmn_w0_0x1_lsl_12.2024-03-07.035819.705486.fuzz [new file with mode: 0644]
test/fuzz/SIGSEGV.PC.aaaaaaae3998.STACK.0.CODE.1.ADDR.8.INSTR.ldrb_w8_x8_8.2024-03-07.035825.707512.fuzz [new file with mode: 0644]
test/fuzz/SIGSEGV.PC.aaaaaaae39ac.STACK.0.CODE.1.ADDR.8.INSTR.ldrb_w20_x21_8.2024-03-11.003303.27182.fuzz [new file with mode: 0644]
test/tools/launchTests.sh
tools/wbxml2xml_tool.c
tools/xml2wbxml_tool.c

index 2b1f9d04149601de27a5095d19e98d4bae3c36fc..17aea87604320676075e391955f9ab017325ddb9 100644 (file)
@@ -58,4 +58,4 @@ jobs:
       shell: bash
       # Execute tests defined by the CMake configuration.  
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ctest -C $BUILD_TYPE
+      run: ctest --output-on-failure -C $BUILD_TYPE
index ab1ec8c6fc71afe6fc6eb6e511dcc76d29b08a37..799f1a67ab0a82e21c17d8d40a996eb3f55a71b3 100644 (file)
@@ -1,8 +1,9 @@
+cmake_minimum_required(VERSION 3.5)
 PROJECT( libwbxml C )
 
 SET( LIBWBXML_VERSION_MAJOR "0" )
 SET( LIBWBXML_VERSION_MINOR "11" )
-SET( LIBWBXML_VERSION_PATCH "8" )
+SET( LIBWBXML_VERSION_PATCH "10" )
 IF( LIBWBXML_VERSION_BETA )
     IF( LIBWBXML_VERSION_BETA VERSION_GREATER 90 )
         MATH( EXPR LIBWBXML_VERSION_MINOR "${LIBWBXML_VERSION_MINOR} - 1" )
@@ -16,21 +17,21 @@ SET( LIBWBXML_VERSION "${LIBWBXML_VERSION_MAJOR}.${LIBWBXML_VERSION_MINOR}.${LIB
 # The most recent interface number that this library implements.
 #UPDATE: If any interface have been added, removed or changed since
 #UPDATE: the last update increment CURRENT.
-SET( LIBWBXML_LIBVERSION_CURRENT 1 )
+SET( LIBWBXML_LIBVERSION_CURRENT 2 )
 
 # The implementation number of the CURRENT interface.
 # UPDATE: Increment only if the library code has changed at all, since
 # UPDATE: last release.
 # UPDATE: Set REVISION to 0 if any interface have been added, removed or
 # UPDATE: changed since the last update.
-SET( LIBWBXML_LIBVERSION_REVISION 8 )
+SET( LIBWBXML_LIBVERSION_REVISION 1 )
 
 # The difference between the newest and the oldest interfaces.
 # UPDATE: If any interface have been added since the last public
 # UPDATE: release, then increment.
 # UPDATE: If any interface have been removed since the last release
 # UPDATE: reset to 0.
-SET( LIBWBXML_LIBVERSION_AGE 0 )
+SET( LIBWBXML_LIBVERSION_AGE 1 )
 
 # The range of implemention CURRENT - AGE is the SOVERSION
 MATH( EXPR LIBWBXML_LIBVERSION_SOVERSION "${LIBWBXML_LIBVERSION_CURRENT} - ${LIBWBXML_LIBVERSION_AGE}" )
@@ -51,8 +52,6 @@ IF( WBXML_INSTALL_FULL_HEADERS )
 
 ENDIF( WBXML_INSTALL_FULL_HEADERS )
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
-
 # TODO: Move to external file/macro
 SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
 
@@ -94,19 +93,31 @@ MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build w
 # zlib is not used
 # nsl is part of libc6
 
+# Expat support
 FIND_PACKAGE( Expat REQUIRED )
-FIND_PACKAGE( Check )
-FIND_PACKAGE( Iconv )
-
+IF( NOT EXPAT_FOUND )
+    # cmake introduced a bug in version 3.27
+    FIND_PACKAGE( PkgConfig )
+    IF(PKGCONFIG_FOUND)
+        PKG_CHECK_MODULES( EXPAT expat )
+    ENDIF(PKGCONFIG_FOUND)
+ENDIF ( NOT EXPAT_FOUND )
 IF( EXPAT_FOUND )
     SET( HAVE_EXPAT 1 )
 ENDIF( EXPAT_FOUND )
 
+# Testing support
+FIND_PACKAGE( PkgConfig )
+IF(PKGCONFIG_FOUND)
+    PKG_CHECK_MODULES( CHECK check )
+ENDIF(PKGCONFIG_FOUND)
 IF(CHECK_FOUND)
        OPTION( ENABLE_UNIT_TEST "enable unit tests" ON )
-       INCLUDE( Testing )
+       ENABLE_TESTING()
 ENDIF(CHECK_FOUND)
 
+# Character conversion support
+FIND_PACKAGE( Iconv )
 SET( WBXML_SUPPORT_ICONV OFF )
 IF( ICONV_FOUND )
     SET( HAVE_ICONV 1 )
@@ -287,3 +298,4 @@ ADD_SUBDIRECTORY( test/tools )
 IF(CHECK_FOUND)
     ADD_SUBDIRECTORY( test/api )
 ENDIF(CHECK_FOUND)
+ADD_SUBDIRECTORY( test/fuzz )
index ff713f157e7f31f9db178b618473bbf40ea5abf0..bde537274589d519017c2c75d9c3478d8ceb4c07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2024-06-17  Michael Bell <michael.bell@web.de>
+  * Released 0.11.10
+  * Removed a few unused variables which gcc reported during building
+    with -Wall compiler option. A notable case was in function
+    decode_wv_datetime where a memory allocation failure was ignored
+    (pull request #92 by Petr Pisar).
+  * Added workaround for buggy FindEXPAT in cmake 3.27-3.29.
+  * Enabled --output-on-failure in GitHub runner config of ctest.
+  * Removed proprietary Testing.cmake.
+  * Updated the cmake package information by replacing the find module with
+    proper cmake config and version files.
+  * Removed all cmake find modules of third party dependencies.
+  * Replaced proprietary FindCheck.cmake with standard usage of PkgConfig.
+
+2024-06-07  Michael Bell <michael.bell@web.de>
+  * Released 0.11.9
+  * Removed assert in function wbxml_tree_clb_xml_end_element of
+    wbxml_tree_clb_xml.c. The function had already the correct error handling
+    implemented. The library no longer crashes but returns an error. The usage
+    of assert.h was removed from wbxml_tree_clb_xml.c.
+  * Fixed SIGSEGV during parsing of malformed WV document in wbxml_parser.c.
+    (SIGSEGV from Simon Koski & Alex Zhang)
+  * Fixed the handling of a wrong Unicode character in the function
+    parse_entity of wbxml_parser.c. The library no longer crashes but returns
+    an error. Therefore, a new error was defined in wbxml_errors.h. The usage
+    of assert.h was removed from wbxml_parser.c.
+    (SIGABRT from Simon Koski & Alex Zhang)
+  * Added missing NULL pointer check in function decode_opaque_content of
+    wbxml_parser.c (SIGSEGV from Simon Koski & Alex Zhang).
+  * Added a directory for and with fuzz tests which crash(ed) the library.
+    (Thanks goes to Simon Koski & Alex Zhang for the tests.)
+  * Modify wbxml_getopt return opt type to int
+  * Check for normalize_xml.pl failures in the tests (pull request #84).
+
 2022-02-28  Michael Bell <michael.bell@web.de>
   * Released 0.11.8
   * Changed location of releases to GitHub only in README.
diff --git a/RELEASE b/RELEASE
index 9650e7798f2b7b527fbfa4b4dce6341aeff6bc77..2e48cc1222bcb590fd8039879b6e49dd9e9f3abc 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -3,9 +3,14 @@ Making a release
 
 To make a release of libwbxml, do the following:
 
- - check out a fresh copy from github
+(1) Check out a fresh copy from GitHub
 
- - increment the version numbers in ./CMakeLists.txt: 
+   Please check upfront if your fork is in sync with the upstream repositiory.
+   GitHub can do this for you by just clicking on the button "Sync fork".
+
+(2) Update the version numbers in CMakeLists.txt
+
+   Please follow strictly the guidance in CMakelists.txt.
 
    Package Version:
    LIBWBXML_VERSION_MAJOR
@@ -13,41 +18,49 @@ To make a release of libwbxml, do the following:
    LIBWBXML_VERSION_PATCH
 
    Library Version:
-   LIBWBXML_LIBVERSION_AGE 
-    * Increment if any interface changed since last release.
-
+   LIBWBXML_LIBVERSION_CURRENT 
    LIBWBXML_LIBVERSION_REVISION
-    * Increment if any library code changed since last release.
-      Set to 0 if any interface  has been changed since last release.
-
    LIBWBXML_LIBVERSION_AGE
-    * Reset to 0 if any interface has been removed since last release.
-      If any interface has been added then increment.
 
- - Run "make test" again several times to try to see race conditions.
+(3) Test the source code
+
+   Run "make test" again several times to try to see race conditions.
+
    "cmake . -B/tmp/build/libwbxml"
    "cd /tmp/build/libwbxml"
    "make"
    "make test"
 
- - Check ChangeLog to be complete and add the new release name.
+(4) Update ChangeLog
+
+   Check ChangeLog to be complete and add the new release name.
 
- - Final steps with git:
-   git pull origin
-   git pull upstream master
+(5) Create a pull request for the new release
+
+   git pull
    git status
-   git commit -a
+   git diff
+   git commit -a -m "libwbxml v$MAJOR.$MINOR.$PATCH"
    git push
-   git tag libwbxml-$MAJOR.$MINOR.$PATCH
-   git push origin libwbxml-$MAJOR.$MINOR.$PATCH
 
- - if someone else made changes and the push fails,
-   you have to "git pull" and run the tests again
+   Please create the pull request via the web GUI of GitHub.
+
+(6) Merge the pull request.
+
+   Please merge the pull request via the web GUI of GitHub.
+   Please use "libwbxml v$MAJOR.$MINOR.$PATCH" as title and description.
+
+(7) Create a new tag.
+
+   Please create a new tag via the web GUI of GitHub.
+
+   libwbxml-$MAJOR.$MINOR.$PATCH
+
+(8) Write the release notes
 
- - please run "git status" before you continue to be 100 percent sure
-   that there is no forgotten commit and no unrevisioned file.
+   Please create a new release on GitHub and use the web GUI of Github. 
+   Please reflect about the ChangeLog and add think about to whom you
+   would like to say thank you.
 
- - Once the commit succeeds, you have to create a new release on GitHub.
-   Please create a pull request from your fork.
-   Please use the web GUI of Github and write some useful release notes. 
+(9) Celebrate the release!
 
diff --git a/THANKS b/THANKS
index 51a4d0f9f935399fee0afb927049df97d00150a7..517cc164722c07dfe39a860af3dfa494298d55e2 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -28,6 +28,10 @@ Boaz Yaniv               (MS Visual Studio fixes)
 Slava Monich             <slava@monich.com>
 David Llewellyn-Jones    <david.llewellyn-jones@jolla.com>
 Slávek Banko             <slavek.banko@axis.cz>
+Boris Shmarin            <b.shmarin@omp.ru>
+yangchenguang            <yangchenguang@uniontech.com>
+Simon Koski              (ACM Cyber at UCLA, fuzz testing)
+Alex Zhang               (ACM Cyber at UCLA, fuzz testing)
 
 If you think your name is missing here
 then please feel free to create a ticket.
index f2c136b4829f2a08860d1aeb57e57b9d83414ceb..c386b0804f943c26cda8b6b6a4e61b7f9ee63dca 100644 (file)
@@ -1,5 +1,23 @@
 
-SET( LIBWBXML_CMAKE_MODULE "${CMAKE_CURRENT_SOURCE_DIR}/modules/FindLibWbxml2.cmake" )
+# Standard header and include paths were already defined.
 
-INSTALL( FILES ${LIBWBXML_CMAKE_MODULE} DESTINATION ${CMAKE_ROOT}/Modules/ )
+include(CMakePackageConfigHelpers)
+
+configure_package_config_file(
+    libwbxml2-config.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/libwbxml2-config.cmake
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libwbxml2
+    PATH_VARS
+        LIBWBXML_LIBRARIES_DIR
+        LIBWBXML_INCLUDE_DIR
+)
+
+# Please note: All libwbxml releases of the 0.11 series are downward compatible until v0.11.0.
+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/libwbxml2-config-version.cmake"
+  VERSION "${LIBWBXML_VERSION}"
+  COMPATIBILITY SameMinorVersion )
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libwbxml2-config.cmake
+              ${CMAKE_CURRENT_BINARY_DIR}/libwbxml2-config-version.cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libwbxml2 )
 
diff --git a/cmake/libwbxml2-config.cmake.in b/cmake/libwbxml2-config.cmake.in
new file mode 100644 (file)
index 0000000..18923da
--- /dev/null
@@ -0,0 +1,18 @@
+
+@PACKAGE_INIT@
+
+FIND_PACKAGE( Expat REQUIRED )
+FIND_PACKAGE( PkgConfig )
+IF(PKGCONFIG_FOUND)
+    PKG_SEARCH_MODULE( CHECK check )
+ENDIF(PKGCONFIG_FOUND)
+FIND_PACKAGE( Iconv )
+
+set_and_check(LIBWBXML2_LIBRARIES_DIR "@PACKAGE_LIBWBXML_LIBRARIES_DIR@")
+set_and_check(LIBWBXML2_INCLUDE_DIR "@PACKAGE_LIBWBXML_INCLUDE_DIR@")
+
+# This is for linking only (e.g., "-lwbxml2").
+SET(LIBWBXML2_LIBRARIES "wbxml2")
+
+check_required_components(libwbxml2)
+
diff --git a/cmake/modules/FindBONOBO2.cmake b/cmake/modules/FindBONOBO2.cmake
deleted file mode 100644 (file)
index 2c75b15..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-# - Try to find bonobo2 
-# Find bonobo2 headers, libraries and the answer to all questions.
-#
-#  BONOBO2_FOUND               True if bonobo2 got found
-#  BONOBO2_INCLUDEDIR          Location of bonobo2 headers 
-#  BONOBO2_LIBRARIES           List of libaries to use bonobo2
-#  BONOBO2_DEFINITIONS         Definitions to compile bonobo2 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-
-
-INCLUDE( FindPkgConfig )
-# Take care about libbonobo-2.0.pc settings
-IF ( BONOBO2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( BONOBO2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( BONOBO2_FIND_REQUIRED )
-
-IF ( BONOBO2_MIN_VERSION )
-       pkg_search_module( BONOBO2 ${_pkgconfig_REQUIRED} libbonobo-2.0>=${BONOBO2_MIN_VERSION} )
-ELSE ( BONOBO2_MIN_VERSION )
-       pkg_search_module( BONOBO2 ${_pkgconfig_REQUIRED} libbonobo-2.0 )
-ENDIF ( BONOBO2_MIN_VERSION )
-
-
-# Look for libbonobo2 include dir and libraries w/o pkgconfig
-IF ( NOT BONOBO2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _bonobo2_include_DIR libbonobo.h PATH_SUFFIXES libbonobo-2.0 
-               PATHS
-               /opt/local/include/
-               /sw/include/
-               /usr/local/include/
-               /usr/include/
-       )
-       FIND_LIBRARY( _bonobo2_link_DIR bonobo-2 
-               PATHS
-               /opt/local/lib
-               /sw/lib
-               /usr/lib
-               /usr/local/lib
-               /usr/lib64
-               /usr/local/lib64
-               /opt/lib64
-       )
-       IF ( _bonobo2_include_DIR AND _bonobo2_link_DIR )
-               SET ( _bonobo2_FOUND TRUE )
-       ENDIF ( _bonobo2_include_DIR AND _bonobo2_link_DIR )
-
-
-       IF ( _bonobo2_FOUND )
-               SET ( BONOBO2_INCLUDE_DIRS ${_bonobo2_include_DIR} )
-               SET ( BONOBO2_LIBRARIES ${_bonobo2_link_DIR} )
-       ENDIF ( _bonobo2_FOUND )
-
-       # Handle dependencies
-       IF ( NOT BONOBOACTIVATION2_FOUND )
-               FIND_PACKAGE( BONOBOACTIVATION2 REQUIRED)
-               IF ( BONOBOACTIVATION2_FOUND )
-                       SET ( BONOBO2_INCLUDE_DIRS ${BONOBO2_INCLUDE_DIRS} ${BONOBOACTIVATION2_INCLUDE_DIRS} )
-                       SET ( BONOBO2_LIBRARIES ${BONOBO2_LIBRARIES} ${BONOBOACTIVATION2_LIBRARIES} )
-               ENDIF ( BONOBOACTIVATION2_FOUND )
-       ENDIF ( NOT BONOBOACTIVATION2_FOUND )
-       IF ( NOT ORBIT2_FOUND )
-               FIND_PACKAGE( ORBit2 REQUIRED)
-               IF ( ORBIT2_FOUND )
-                       SET ( BONOBO2_INCLUDE_DIRS ${BONOBO2_INCLUDE_DIRS} ${ORBIT2_INCLUDE_DIRS} )
-                       SET ( BONOBO2_LIBRARIES ${BONOBO2_LIBRARIES} ${ORBIT2_LIBRARIES} )
-               ENDIF ( ORBIT2_FOUND )
-       ENDIF ( NOT ORBIT2_FOUND )
-        IF ( NOT GLIB2_FOUND )
-                FIND_PACKAGE( GLIB2 REQUIRED)
-
-                IF ( GMODULE2_FOUND )
-                        SET ( BONOBO2_INCLUDE_DIRS ${BONOBO2_INCLUDE_DIRS} ${GMODULE2_INCLUDE_DIR} )
-                        SET ( BONOBO2_LIBRARIES ${BONOBO2_LIBRARIES} ${GMODULE2_LIBRARY} )
-                ENDIF ( GMODULE2_FOUND )
-                IF ( GLIB2_FOUND )
-                        SET ( BONOBO2_INCLUDE_DIRS ${BONOBO2_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR} )
-                        SET ( BONOBO2_LIBRARIES ${BONOBO2_LIBRARIES} ${GLIB2_LIBRARY} )
-                ENDIF ( GLIB2_FOUND )
-        ENDIF ( NOT GLIB2_FOUND )
-
-
-
-       # Report results
-       IF ( BONOBO2_LIBRARIES AND BONOBO2_INCLUDE_DIRS AND _bonobo2_FOUND )    
-               SET( BONOBO2_FOUND 1 )
-               IF ( NOT BONOBO2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found bonobo2: ${BONOBO2_LIBRARIES} ${BONOBO2_INCLUDE_DIRS}" )
-               ENDIF ( NOT BONOBO2_FIND_QUIETLY )
-       ELSE ( BONOBO2_LIBRARIES AND BONOBO2_INCLUDE_DIRS AND _bonobo2_FOUND )  
-               IF ( BONOBO2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find bonobo2" )
-               ELSE ( BONOBO2_FIND_REQUIRED )
-                       IF ( NOT BONOBO2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find bonobo2" )      
-                       ENDIF ( NOT BONOBO2_FIND_QUIETLY )
-               ENDIF ( BONOBO2_FIND_REQUIRED )
-       ENDIF ( BONOBO2_LIBRARIES AND BONOBO2_INCLUDE_DIRS AND _bonobo2_FOUND ) 
-
-ENDIF ( NOT BONOBO2_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( BONOBO2_LIBRARIES BONOBO2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindBONOBOACTIVATION2.cmake b/cmake/modules/FindBONOBOACTIVATION2.cmake
deleted file mode 100644 (file)
index fa87316..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-# - Try to find bonobo-activation-2 
-# Find bonobo-activation-2 headers, libraries and the answer to all questions.
-#
-#  BONOBOACTIVATION2_FOUND               True if bonobo-activation-2 got found
-#  BONOBOACTIVATION2_INCLUDEDIR          Location of bonobo-activation-2 headers 
-#  BONOBOACTIVATION2_LIBRARIES           List of libaries to use bonobo-activation-2
-#  BONOBOACTIVATION2_DEFINITIONS         Definitions to compile bonobo-activation-2 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-
-
-
-
-
-
-INCLUDE( FindPkgConfig )
-# Take care about bonobo-activation-2.0.pc settings
-IF ( BONOBOACTIVATION2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( BONOBOACTIVATION2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( BONOBOACTIVATION2_FIND_REQUIRED )
-
-IF ( BONOBOACTIVATION2_MIN_VERSION )
-       pkg_search_module( BONOBOACTIVATION2 ${_pkgconfig_REQUIRED} bonobo-activation-2.0>=${BONOBOACTIVATION2_MIN_VERSION} )
-ELSE ( BONOBOACTIVATION2_MIN_VERSION )
-       pkg_search_module( BONOBOACTIVATION2 ${_pkgconfig_REQUIRED} bonobo-activation-2.0 )
-ENDIF ( BONOBOACTIVATION2_MIN_VERSION )
-
-
-# Look for bonoboactivation2 include dir and libraries w/o pkgconfig
-IF ( NOT BONOBOACTIVATION2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _bonoboactivation2_include_DIR bonobo-activation/bonobo-activation.h PATH_SUFFIXES bonobo-activation-2.0 
-               PATHS
-               /opt/local/include/
-               /sw/include/
-               /usr/local/include/
-               /usr/include/
-       )
-       FIND_LIBRARY( _bonoboactivation2_link_DIR bonobo-activation 
-               PATHS
-               /opt/local/lib
-               /sw/lib
-               /usr/lib
-               /usr/local/lib
-               /usr/lib64
-               /usr/local/lib64
-               /opt/lib64
-       )
-
-       IF ( _bonoboactivation2_include_DIR AND _bonoboactivation2_link_DIR )
-               SET ( _bonoboactivation2_FOUND TRUE )
-       ENDIF ( _bonoboactivation2_include_DIR AND _bonoboactivation2_link_DIR )
-
-
-       IF ( _bonoboactivation2_FOUND )
-               SET ( BONOBOACTIVATION2_INCLUDE_DIRS ${_bonoboactivation2_include_DIR} )
-               SET ( BONOBOACTIVATION2_LIBRARIES ${_bonoboactivation2_link_DIR} )
-       ENDIF ( _bonoboactivation2_FOUND )
-
-       # Handle dependencies
-       IF ( NOT ORBIT2_FOUND )
-               FIND_PACKAGE( ORBit2 REQUIRED)
-               IF ( ORBIT2_FOUND )
-                       SET ( BONOBOACTIVATION2_INCLUDE_DIRS ${BONOBOACTIVATION2_INCLUDE_DIRS} ${ORBIT2_INCLUDE_DIRS} )
-                       SET ( BONOBOACTIVATION2_LIBRARIES ${BONOBOACTIVATION2_LIBRARIES} ${ORBIT2_LIBRARIES} )
-               ENDIF ( ORBIT2_FOUND )
-       ENDIF ( NOT ORBIT2_FOUND )
-        IF ( NOT GLIB2_FOUND )
-                FIND_PACKAGE( GLIB2 REQUIRED)
-
-                IF ( GMODULE2_FOUND )
-                        SET ( BONOBOACTIVATION2_INCLUDE_DIRS ${BONOBOACTIVATION2_INCLUDE_DIRS} ${GMODULE2_INCLUDE_DIR} )
-                        SET ( BONOBOACTIVATION2_LIBRARIES ${BONOBOACTIVATION2_LIBRARIES} ${GMODULE2_LIBRARY} )
-                ENDIF ( GMODULE2_FOUND )
-                IF ( GLIB2_FOUND )
-                        SET ( BONOBOACTIVATION2_INCLUDE_DIRS ${BONOBOACTIVATION2_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR} )
-                        SET ( BONOBOACTIVATION2_LIBRARIES ${BONOBOACTIVATION2_LIBRARIES} ${GLIB2_LIBRARY} )
-                ENDIF ( GLIB2_FOUND )
-        ENDIF ( NOT GLIB2_FOUND )
-
-
-       # Report results
-       IF ( BONOBOACTIVATION2_LIBRARIES AND BONOBOACTIVATION2_INCLUDE_DIRS AND _bonoboactivation2_FOUND )      
-               SET( BONOBOACTIVATION2_FOUND 1 )
-               IF ( NOT BONOBOACTIVATION2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found bonobo-activation2: ${BONOBOACTIVATION2_LIBRARIES} ${BONOBOACTIVATION2_INCLUDE_DIRS}" )
-               ENDIF ( NOT BONOBOACTIVATION2_FIND_QUIETLY )
-       ELSE ( BONOBOACTIVATION2_LIBRARIES AND BONOBOACTIVATION2_INCLUDE_DIRS AND _bonoboactivation2_FOUND )    
-               IF ( BONOBOACTIVATION2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find bonobo-activation2" )
-               ELSE ( BONOBOACTIVATION2_FIND_REQUIRED )
-                       IF ( NOT BONOBOACTIVATION2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find bonobo-activation2" )   
-                       ENDIF ( NOT BONOBOACTIVATION2_FIND_QUIETLY )
-               ENDIF ( BONOBOACTIVATION2_FIND_REQUIRED )
-       ENDIF ( BONOBOACTIVATION2_LIBRARIES AND BONOBOACTIVATION2_INCLUDE_DIRS AND _bonoboactivation2_FOUND )   
-
-ENDIF ( NOT BONOBOACTIVATION2_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( BONOBOACTIVATION2_LIBRARIES BONOBOACTIVATION2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindBlueZ.cmake b/cmake/modules/FindBlueZ.cmake
deleted file mode 100644 (file)
index 8284380..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-# - Try to find BlueZ
-# Find BlueZ headers, libraries and the answer to all questions.
-#
-#  BLUEZ_FOUND               True if BlueZ libraries got found
-#  BLUEZ_INCLUDE_DIRS         Location of BlueZ headers 
-#  BLUEZ_LIBRARIES           List of libaries to use BlueZ
-#
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007-2009 Bjoern Ricks  <bjoern.ricks@gmail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-# Take care about bluez.pc settings
-IF ( BlueZ_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( BlueZ_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( BlueZ_FIND_REQUIRED )
-
-IF ( BLUEZ_MIN_VERSION )
-       PKG_SEARCH_MODULE( BLUEZ ${_pkgconfig_REQUIRED} bluez>=${BLUEZ_MIN_VERSION} )
-ELSE ( BLUEZ_MIN_VERSION )
-       PKG_SEARCH_MODULE( BLUEZ ${_pkgconfig_REQUIRED} bluez )
-ENDIF ( BLUEZ_MIN_VERSION )
-
-# Look for BlueZ include dir and libraries
-IF( NOT BLUEZ_FOUND AND NOT PKG_CONFIG_FOUND )
-
-       FIND_PATH( BLUEZ_INCLUDE_DIRS bluetooth/bluetooth.h )
-       FIND_LIBRARY( BLUEZ_LIBRARIES bluetooth )
-
-       # Report results
-       IF ( BLUEZ_LIBRARIES AND BLUEZ_INCLUDE_DIRS )   
-               SET( BLUEZ_FOUND 1 )
-               IF ( NOT BlueZ_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found BlueZ: ${BLUEZ_LIBRARIES}" )
-               ENDIF ( NOT BlueZ_FIND_QUIETLY )
-       ELSE ( BLUEZ_LIBRARIES AND BLUEZ_INCLUDE_DIRS ) 
-               IF ( BlueZ_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find BLUEZ" )
-               ELSE ( BlueZ_FIND_REQUIRED )
-                       IF ( NOT BlueZ_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find BLUEZ" )        
-                       ENDIF ( NOT BlueZ_FIND_QUIETLY )
-               ENDIF ( BlueZ_FIND_REQUIRED )
-       ENDIF ( BLUEZ_LIBRARIES AND BLUEZ_INCLUDE_DIRS )
-
-ENDIF( NOT BLUEZ_FOUND AND NOT PKG_CONFIG_FOUND  )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( BLUEZ_LIBRARIES BLUEZ_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindCheck.cmake b/cmake/modules/FindCheck.cmake
deleted file mode 100644 (file)
index c25ac03..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-# - Try to find the CHECK libraries
-#  Once done this will define
-#
-#  CHECK_FOUND - system has check
-#  CHECK_INCLUDE_DIRS - the check include directory
-#  CHECK_LIBRARIES - check library
-#  
-#  Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-#  Copyright (c) 2007-2009 Bjoern Ricks  <bjoern.ricks@gmail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-INCLUDE( FindPkgConfig )
-
-IF ( Check_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( Check_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( Check_FIND_REQUIRED )
-
-IF ( CHECK_MIN_VERSION )
-       PKG_SEARCH_MODULE( CHECK ${_pkgconfig_REQUIRED} check>=${CHECK_MIN_VERSION} )
-ELSE ( CHECK_MIN_VERSION )
-       PKG_SEARCH_MODULE( CHECK ${_pkgconfig_REQUIRED} check )
-ENDIF ( CHECK_MIN_VERSION )
-
-# Look for CHECK include dir and libraries
-IF( NOT CHECK_FOUND AND NOT PKG_CONFIG_FOUND )
-
-       FIND_PATH( CHECK_INCLUDE_DIRS check.h )
-
-       FIND_LIBRARY( CHECK_LIBRARIES NAMES check )
-
-       IF ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES )
-               SET( CHECK_FOUND 1 )
-               IF ( NOT Check_FIND_QUIETLY )
-                       MESSAGE ( STATUS "Found CHECK: ${CHECK_LIBRARIES}" )
-               ENDIF ( NOT Check_FIND_QUIETLY )
-       ELSE ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES )
-               IF ( Check_FIND_REQUIRED )
-                       MESSAGE( FATAL_ERROR "Could NOT find CHECK" )
-               ELSE ( Check_FIND_REQUIRED )
-                       IF ( NOT Check_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find CHECK" )        
-                       ENDIF ( NOT Check_FIND_QUIETLY )
-               ENDIF ( Check_FIND_REQUIRED )
-       ENDIF ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES )
-ENDIF( NOT CHECK_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( CHECK_INCLUDE_DIRS CHECK_LIBRARIES )
-
diff --git a/cmake/modules/FindEBook1.0.cmake b/cmake/modules/FindEBook1.0.cmake
deleted file mode 100644 (file)
index 98c75ed..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-# - Try to find libebook1.0 components
-# Find libebook 1.0 headers, libraries and the answer to all questions.
-#
-#  LIBEBOOK1.0_FOUND               True if libebook1.0 got found
-#  LIBEBOOK1.0_INCLUDE_DIRS         Location of libebook1.0 headers 
-#  LIBEBOOK1.0_LIBRARIES           List of libaries to use libebook1.0
-#  LIBEBOOK1.0_DEFINITIONS         Definitions to compile libebook1.0 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about libebook-1.0.pc settings
-IF ( EBook1.0_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( EBook1.0_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( EBook1.0_FIND_REQUIRED )
-
-pkg_search_module( LIBEBOOK1.0 ${_pkgconfig_REQUIRED} libebook-1.0 )
-
-
-# Look for libebook1.0 include dir and libraries w/o pkg-config.
-IF ( NOT LIBEBOOK1.0_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libebook1.0_include_DIR libebook/e-book.h 
-                       PATH_SUFFIXES evolution-data-server-1.12 evolution-data-server-1.10 evolution-data-server-1.8 evolution-data-server-1.6 evolution-data-server-1.4 evolution-data-server-1.0
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ 
-       )
-       FIND_LIBRARY( _libebook1.0_link_DIR ebook-1.0
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 
-       )
-
-        IF ( _libebook1.0_include_DIR AND _libebook1.0_link_DIR )
-                SET ( _libebook1.0_FOUND TRUE )
-        ENDIF ( _libebook1.0_include_DIR AND _libebook1.0_link_DIR )
-
-
-        IF ( _libebook1.0_FOUND )
-                SET ( LIBEBOOK1.0_INCLUDE_DIRS ${_libebook1.0_include_DIR} )
-                SET ( LIBEBOOK1.0_LIBRARIES ${_libebook1.0_link_DIR} )
-        ENDIF ( _libebook1.0_FOUND )
-
-        # Handle dependencies
-       IF ( NOT LIBEDATASERVER1.0_FOUND )
-               FIND_PACKAGE ( EDataServer1.0 REQUIRED )
-                IF ( LIBEDATASERVER1.0_FOUND )
-                        SET ( LIBEBOOK1.0_INCLUDE_DIRS ${LIBEBOOK1.0_INCLUDE_DIRS} ${LIBEDATASERVER1.0_INCLUDE_DIRS} )
-                        SET ( LIBEBOOK1.0_LIBRARIES ${LIBEBOOK1.0_LIBRARIES} ${LIBEDATASERVER1.0_LIBRARIES} )
-                ENDIF ( LIBEDATASERVER1.0_FOUND )              
-       ENDIF ( NOT LIBEDATASERVER1.0_FOUND )
-       IF ( NOT LIBGNOME2_FOUND )
-               FIND_PACKAGE ( LibGnome2 REQUIRED )
-                IF ( LIBGNOME2_FOUND )
-                        SET ( LIBEBOOK1.0_INCLUDE_DIRS ${LIBEBOOK1.0_INCLUDE_DIRS} ${LIBGNOME2_INCLUDE_DIRS} )
-                        SET ( LIBEBOOK1.0_LIBRARIES ${LIBEBOOK1.0_LIBRARIES} ${LIBGNOME2_LIBRARIES} )
-                ENDIF ( LIBGNOME2_FOUND )              
-       ENDIF ( NOT LIBGNOME2_FOUND )
-       IF ( NOT BONOBO2_FOUND )
-               FIND_PACKAGE ( BONOBO2 REQUIRED )
-                IF ( BONOBO2_FOUND )
-                        SET ( LIBEBOOK1.0_INCLUDE_DIRS ${LIBEBOOK1.0_INCLUDE_DIRS} ${BONOBO2_INCLUDE_DIRS} )
-                        SET ( LIBEBOOK1.0_LIBRARIES ${LIBEBOOK1.0_LIBRARIES} ${BONOBO2_LIBRARIES} )
-                ENDIF ( BONOBO2_FOUND )                
-       ENDIF ( NOT BONOBO2_FOUND )
-
-       # Report results
-       IF ( LIBEBOOK1.0_LIBRARIES AND LIBEBOOK1.0_INCLUDE_DIRS AND _libebook1.0_FOUND )
-               SET( LIBEBOOK1.0_FOUND 1 )
-               IF ( NOT EBook1.0_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libebook-1.0: ${LIBEBOOK1.0_LIBRARIES}" )
-               ENDIF ( NOT EBook1.0_FIND_QUIETLY )
-       ELSE ( LIBEBOOK1.0_LIBRARIES AND LIBEBOOK1.0_INCLUDE_DIRS AND _libebook1.0_FOUND )      
-               IF ( EBook1.0_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libebook-1.0" )
-               ELSE ( EBook1.0_FIND_REQUIRED )
-                       IF ( NOT EBook1.0_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libebook-1.0" ) 
-                       ENDIF ( NOT EBook1.0_FIND_QUIETLY )
-               ENDIF ( EBook1.0_FIND_REQUIRED )
-       ENDIF ( LIBEBOOK1.0_LIBRARIES AND LIBEBOOK1.0_INCLUDE_DIRS AND _libebook1.0_FOUND )     
-
-ENDIF ( NOT LIBEBOOK1.0_FOUND AND NOT PKG_CONFIG_FOUND )
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBEBOOK1.0_LIBRARIES LIBEBOOK1.0_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindEBook1.2.cmake b/cmake/modules/FindEBook1.2.cmake
deleted file mode 100644 (file)
index 7496de3..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-# - Try to find libebook1.2 components
-# Find libebook 1.2 headers, libraries and the answer to all questions.
-#
-#  LIBEBOOK1.2_FOUND               True if libebook1.2 got found
-#  LIBEBOOK1.2_INCLUDE_DIRS         Location of libebook1.2 headers 
-#  LIBEBOOK1.2_LIBRARIES           List of libaries to use libebook1.2
-#  LIBEBOOK1.2_DEFINITIONS         Definitions to compile libebook1.2 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about libebook-1.2.pc settings
-IF ( EBook1.2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( EBook1.2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( EBook1.2_FIND_REQUIRED )
-
-pkg_search_module( LIBEBOOK1.2 ${_pkgconfig_REQUIRED} libebook-1.2 )
-
-
-# Look for libebook1.2 include dir and libraries w/o pkg-config.
-IF ( NOT LIBEBOOK1.2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libebook1.2_include_DIR libebook/e-book.h 
-                       PATH_SUFFIXES evolution-data-server-1.12 evolution-data-server-1.10 evolution-data-server-1.8 evolution-data-server-1.6 evolution-data-server-1.4 evolution-data-server-1.2
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ 
-       )
-       FIND_LIBRARY( _libebook1.2_link_DIR ebook-1.2
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 
-       )
-
-        IF ( _libebook1.2_include_DIR AND _libebook1.2_link_DIR )
-                SET ( _libebook1.2_FOUND TRUE )
-        ENDIF ( _libebook1.2_include_DIR AND _libebook1.2_link_DIR )
-
-
-        IF ( _libebook1.2_FOUND )
-                SET ( LIBEBOOK1.2_INCLUDE_DIRS ${_libebook1.2_include_DIR} )
-                SET ( LIBEBOOK1.2_LIBRARIES ${_libebook1.2_link_DIR} )
-        ENDIF ( _libebook1.2_FOUND )
-
-        # Handle dependencies
-       IF ( NOT LIBEDATASERVER1.2_FOUND )
-               FIND_PACKAGE ( EDataServer1.2 REQUIRED )
-                IF ( LIBEDATASERVER1.2_FOUND )
-                        SET ( LIBEBOOK1.2_INCLUDE_DIRS ${LIBEBOOK1.2_INCLUDE_DIRS} ${LIBEDATASERVER1.2_INCLUDE_DIRS} )
-                        SET ( LIBEBOOK1.2_LIBRARIES ${LIBEBOOK1.2_LIBRARIES} ${LIBEDATASERVER1.2_LIBRARIES} )
-                ENDIF ( LIBEDATASERVER1.2_FOUND )              
-       ENDIF ( NOT LIBEDATASERVER1.2_FOUND )
-       IF ( NOT LIBGNOME2_FOUND )
-               FIND_PACKAGE ( LibGnome2 REQUIRED )
-                IF ( LIBGNOME2_FOUND )
-                        SET ( LIBEBOOK1.2_INCLUDE_DIRS ${LIBEBOOK1.2_INCLUDE_DIRS} ${LIBGNOME2_INCLUDE_DIRS} )
-                        SET ( LIBEBOOK1.2_LIBRARIES ${LIBEBOOK1.2_LIBRARIES} ${LIBGNOME2_LIBRARIES} )
-                ENDIF ( LIBGNOME2_FOUND )              
-       ENDIF ( NOT LIBGNOME2_FOUND )
-       IF ( NOT BONOBO2_FOUND )
-               SET ( BONOBO2_MIN_VERSION "2.4.2" )
-               FIND_PACKAGE ( BONOBO2 REQUIRED )
-                IF ( BONOBO2_FOUND )
-                        SET ( LIBEBOOK1.2_INCLUDE_DIRS ${LIBEBOOK1.2_INCLUDE_DIRS} ${BONOBO2_INCLUDE_DIRS} )
-                        SET ( LIBEBOOK1.2_LIBRARIES ${LIBEBOOK1.2_LIBRARIES} ${BONOBO2_LIBRARIES} )
-                ENDIF ( BONOBO2_FOUND )                
-       ENDIF ( NOT BONOBO2_FOUND )
-
-       # Report results
-       IF ( LIBEBOOK1.2_LIBRARIES AND LIBEBOOK1.2_INCLUDE_DIRS AND _libebook1.2_FOUND )
-               SET( LIBEBOOK1.2_FOUND 1 )
-               IF ( NOT EBook1.2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libebook-1.2: ${LIBEBOOK1.2_LIBRARIES}" )
-               ENDIF ( NOT EBook1.2_FIND_QUIETLY )
-       ELSE ( LIBEBOOK1.2_LIBRARIES AND LIBEBOOK1.2_INCLUDE_DIRS AND _libebook1.2_FOUND )      
-               IF ( EBook1.2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libebook-1.2" )
-               ELSE ( EBook1.2_FIND_REQUIRED )
-                       IF ( NOT EBook1.2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libebook-1.2" ) 
-                       ENDIF ( NOT EBook1.2_FIND_QUIETLY )
-               ENDIF ( EBook1.2_FIND_REQUIRED )
-       ENDIF ( LIBEBOOK1.2_LIBRARIES AND LIBEBOOK1.2_INCLUDE_DIRS AND _libebook1.2_FOUND )     
-
-ENDIF ( NOT LIBEBOOK1.2_FOUND AND NOT PKG_CONFIG_FOUND )
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBEBOOK1.2_LIBRARIES LIBEBOOK1.2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindECal1.0.cmake b/cmake/modules/FindECal1.0.cmake
deleted file mode 100644 (file)
index 086258a..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-# - Try to find libecal1.0 components
-# Find libecal 1.0 headers, libraries and the answer to all questions.
-#
-#  LIBECAL1.0_FOUND               True if libecal1.0 got found
-#  LIBECAL1.0_INCLUDE_DIRS         Location of libecal1.0 headers 
-#  LIBECAL1.0_LIBRARIES           List of libaries to use libecal1.0
-#  LIBECAL1.0_DEFINITIONS         Definitions to compile libecal1.0 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about libecal-1.0.pc settings
-IF ( ECal1.0_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( ECal1.0_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( ECal1.0_FIND_REQUIRED )
-
-pkg_search_module( LIBECAL1.0 ${_pkgconfig_REQUIRED} libecal-1.0 )
-
-
-# Look for libecal1.0 include dir and libraries w/o pkg-config.
-IF ( NOT LIBECAL1.0_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libecal1.0_include_DIR libecal/e-cal.h 
-                       PATH_SUFFIXES evolution-data-server-1.12 evolution-data-server-1.10 evolution-data-server-1.8 evolution-data-server-1.6 evolution-data-server-1.4 evolution-data-server-1.0
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ 
-       )
-       FIND_LIBRARY( _libecal1.0_link_DIR ecal-1.0
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 
-       )
-
-        IF ( _libecal1.0_include_DIR AND _libecal1.0_link_DIR )
-                SET ( _libecal1.0_FOUND TRUE )
-        ENDIF ( _libecal1.0_include_DIR AND _libecal1.0_link_DIR )
-
-
-        IF ( _libecal1.0_FOUND )
-                SET ( LIBECAL1.0_INCLUDE_DIRS ${_libecal1.0_include_DIR} )
-                SET ( LIBECAL1.0_LIBRARIES ${_libecal1.0_link_DIR} )
-        ENDIF ( _libecal1.0_FOUND )
-
-        # Handle dependencies
-       IF ( NOT LIBEDATASERVER1.0_FOUND )
-               FIND_PACKAGE ( EDataServer1.0 REQUIRED )
-                IF ( LIBEDATASERVER1.0_FOUND )
-                        SET ( LIBECAL1.0_INCLUDE_DIRS ${LIBECAL1.0_INCLUDE_DIRS} ${LIBEDATASERVER1.0_INCLUDE_DIRS} )
-                        SET ( LIBECAL1.0_LIBRARIES ${LIBECAL1.0_LIBRARIES} ${LIBEDATASERVER1.0_LIBRARIES} )
-                ENDIF ( LIBEDATASERVER1.0_FOUND )              
-       ENDIF ( NOT LIBEDATASERVER1.0_FOUND )
-       IF ( NOT LIBGNOME2_FOUND )
-               FIND_PACKAGE ( LibGnome2 REQUIRED )
-                IF ( LIBGNOME2_FOUND )
-                        SET ( LIBECAL1.0_INCLUDE_DIRS ${LIBECAL1.0_INCLUDE_DIRS} ${LIBGNOME2_INCLUDE_DIRS} )
-                        SET ( LIBECAL1.0_LIBRARIES ${LIBECAL1.0_LIBRARIES} ${LIBGNOME2_LIBRARIES} )
-                ENDIF ( LIBGNOME2_FOUND )              
-       ENDIF ( NOT LIBGNOME2_FOUND )
-       IF ( NOT BONOBO2_FOUND )
-               FIND_PACKAGE ( BONOBO2 REQUIRED )
-                IF ( BONOBO2_FOUND )
-                        SET ( LIBECAL1.0_INCLUDE_DIRS ${LIBECAL1.0_INCLUDE_DIRS} ${BONOBO2_INCLUDE_DIRS} )
-                        SET ( LIBECAL1.0_LIBRARIES ${LIBECAL1.0_LIBRARIES} ${BONOBO2_LIBRARIES} )
-                ENDIF ( BONOBO2_FOUND )                
-       ENDIF ( NOT BONOBO2_FOUND )
-
-       # Report results
-       IF ( LIBECAL1.0_LIBRARIES AND LIBECAL1.0_INCLUDE_DIRS AND _libecal1.0_FOUND )
-               SET( LIBECAL1.0_FOUND 1 )
-               IF ( NOT ECal1.0_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libecal-1.0: ${LIBECAL1.0_LIBRARIES}" )
-               ENDIF ( NOT ECal1.0_FIND_QUIETLY )
-       ELSE ( LIBECAL1.0_LIBRARIES AND LIBECAL1.0_INCLUDE_DIRS AND _libecal1.0_FOUND ) 
-               IF ( ECal1.0_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libecal-1.0" )
-               ELSE ( ECal1.0_FIND_REQUIRED )
-                       IF ( NOT ECal1.0_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libecal-1.0" )  
-                       ENDIF ( NOT ECal1.0_FIND_QUIETLY )
-               ENDIF ( ECal1.0_FIND_REQUIRED )
-       ENDIF ( LIBECAL1.0_LIBRARIES AND LIBECAL1.0_INCLUDE_DIRS AND _libecal1.0_FOUND )        
-
-ENDIF ( NOT LIBECAL1.0_FOUND AND NOT PKG_CONFIG_FOUND )
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBECAL1.0_LIBRARIES LIBECAL1.0_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindECal1.2.cmake b/cmake/modules/FindECal1.2.cmake
deleted file mode 100644 (file)
index 7a22db4..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-# - Try to find libecal1.2 components
-# Find libecal 1.2 headers, libraries and the answer to all questions.
-#
-#  LIBECAL1.2_FOUND               True if libecal1.2 got found
-#  LIBECAL1.2_INCLUDE_DIRS         Location of libecal1.2 headers 
-#  LIBECAL1.2_LIBRARIES           List of libaries to use libecal1.2
-#  LIBECAL1.2_DEFINITIONS         Definitions to compile libecal1.2 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about libecal-1.2.pc settings
-IF ( ECal1.2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( ECal1.2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( ECal1.2_FIND_REQUIRED )
-
-pkg_search_module( LIBECAL1.2 ${_pkgconfig_REQUIRED} libecal-1.2 )
-
-
-# Look for libecal1.2 include dir and libraries w/o pkg-config.
-IF ( NOT LIBECAL1.2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libecal1.2_include_DIR libecal/e-cal.h 
-                       PATH_SUFFIXES evolution-data-server-1.12 evolution-data-server-1.10 evolution-data-server-1.8 evolution-data-server-1.6 evolution-data-server-1.4 evolution-data-server-1.2
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ 
-       )
-       FIND_LIBRARY( _libecal1.2_link_DIR ecal-1.2
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 
-       )
-
-        IF ( _libecal1.2_include_DIR AND _libecal1.2_link_DIR )
-                SET ( _libecal1.2_FOUND TRUE )
-        ENDIF ( _libecal1.2_include_DIR AND _libecal1.2_link_DIR )
-
-
-        IF ( _libecal1.2_FOUND )
-                SET ( LIBECAL1.2_INCLUDE_DIRS ${_libecal1.2_include_DIR} )
-                SET ( LIBECAL1.2_LIBRARIES ${_libecal1.2_link_DIR} )
-        ENDIF ( _libecal1.2_FOUND )
-
-        # Handle dependencies
-       IF ( NOT LIBEDATASERVER1.2_FOUND )
-               FIND_PACKAGE ( EDataServer1.2 REQUIRED )
-                IF ( LIBEDATASERVER1.2_FOUND )
-                        SET ( LIBECAL1.2_INCLUDE_DIRS ${LIBECAL1.2_INCLUDE_DIRS} ${LIBEDATASERVER1.2_INCLUDE_DIRS} )
-                        SET ( LIBECAL1.2_LIBRARIES ${LIBECAL1.2_LIBRARIES} ${LIBEDATASERVER1.2_LIBRARIES} )
-                ENDIF ( LIBEDATASERVER1.2_FOUND )              
-       ENDIF ( NOT LIBEDATASERVER1.2_FOUND )
-       IF ( NOT LIBGNOME2_FOUND )
-               FIND_PACKAGE ( LibGnome2 REQUIRED )
-                IF ( LIBGNOME2_FOUND )
-                        SET ( LIBECAL1.2_INCLUDE_DIRS ${LIBECAL1.2_INCLUDE_DIRS} ${LIBGNOME2_INCLUDE_DIRS} )
-                        SET ( LIBECAL1.2_LIBRARIES ${LIBECAL1.2_LIBRARIES} ${LIBGNOME2_LIBRARIES} )
-                ENDIF ( LIBGNOME2_FOUND )              
-       ENDIF ( NOT LIBGNOME2_FOUND )
-       IF ( NOT BONOBO2_FOUND )
-               SET ( BONOBO2_MIN_VERSION "2.4.2" )
-               FIND_PACKAGE ( BONOBO2 REQUIRED )
-                IF ( BONOBO2_FOUND )
-                        SET ( LIBECAL1.2_INCLUDE_DIRS ${LIBECAL1.2_INCLUDE_DIRS} ${BONOBO2_INCLUDE_DIRS} )
-                        SET ( LIBECAL1.2_LIBRARIES ${LIBECAL1.2_LIBRARIES} ${BONOBO2_LIBRARIES} )
-                ENDIF ( BONOBO2_FOUND )                
-       ENDIF ( NOT BONOBO2_FOUND )
-
-       # Report results
-       IF ( LIBECAL1.2_LIBRARIES AND LIBECAL1.2_INCLUDE_DIRS AND _libecal1.2_FOUND )
-               SET( LIBECAL1.2_FOUND 1 )
-               IF ( NOT ECal1.2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libecal-1.2: ${LIBECAL1.2_LIBRARIES}" )
-               ENDIF ( NOT ECal1.2_FIND_QUIETLY )
-       ELSE ( LIBECAL1.2_LIBRARIES AND LIBECAL1.2_INCLUDE_DIRS AND _libecal1.2_FOUND ) 
-               IF ( ECal1.2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libecal-1.2" )
-               ELSE ( ECal1.2_FIND_REQUIRED )
-                       IF ( NOT ECal1.2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libecal-1.2" )  
-                       ENDIF ( NOT ECal1.2_FIND_QUIETLY )
-               ENDIF ( ECal1.2_FIND_REQUIRED )
-       ENDIF ( LIBECAL1.2_LIBRARIES AND LIBECAL1.2_INCLUDE_DIRS AND _libecal1.2_FOUND )        
-
-ENDIF ( NOT LIBECAL1.2_FOUND AND NOT PKG_CONFIG_FOUND )
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBECAL1.2_LIBRARIES LIBECAL1.2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindEDataBook1.0.cmake b/cmake/modules/FindEDataBook1.0.cmake
deleted file mode 100644 (file)
index 069eddc..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-# - Try to find libedatabook1.0 components
-# Find libedatabook 1.0 headers, libraries and the answer to all questions.
-#
-#  LIBEDATABOOK1.0_FOUND               True if libedatabook1.0 got found
-#  LIBEDATABOOK1.0_INCLUDE_DIRS         Location of libedatabook1.0 headers 
-#  LIBEDATABOOK1.0_LIBRARIES           List of libaries to use libedatabook1.0
-#  LIBEDATABOOK1.0_DEFINITIONS         Definitions to compile libedatabook1.0 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about libedata-book-1.0.pc settings
-IF ( EDataBook1.0_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( EDataBook1.0_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( EDataBook1.0_FIND_REQUIRED )
-
-pkg_search_module( LIBEDATABOOK1.0 ${_pkgconfig_REQUIRED} libedata-book-1.0 )
-
-
-# Look for libedatabook1.0 include dir and libraries w/o pkg-config.
-IF ( NOT LIBEDATABOOK1.0_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libedatabook1.0_include_DIR libedata-book/e-data-book.h 
-                       PATH_SUFFIXES evolution-data-server-1.12 evolution-data-server-1.10 evolution-data-server-1.8 evolution-data-server-1.6 evolution-data-server-1.4 evolution-data-server-1.0
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ 
-       )
-       FIND_LIBRARY( _libedatabook1.0_link_DIR edata-book-1.0
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 
-       )
-
-        IF ( _libedatabook1.0_include_DIR AND _libedatabook1.0_link_DIR )
-                SET ( _libedatabook1.0_FOUND TRUE )
-        ENDIF ( _libedatabook1.0_include_DIR AND _libedatabook1.0_link_DIR )
-
-
-        IF ( _libedatabook1.0_FOUND )
-                SET ( LIBEDATABOOK1.0_INCLUDE_DIRS ${_libedatabook1.0_include_DIR} )
-                SET ( LIBEDATABOOK1.0_LIBRARIES ${_libedatabook1.0_link_DIR} )
-        ENDIF ( _libedatabook1.0_FOUND )
-
-        # Handle dependencies
-       IF ( NOT LIBEBOOK1.0_FOUND )
-               FIND_PACKAGE ( EBook1.0 REQUIRED )
-                IF ( LIBEBOOK1.0_FOUND )
-                        SET ( LIBEDATABOOK1.0_INCLUDE_DIRS ${LIBEDATABOOK1.0_INCLUDE_DIRS} ${LIBEBOOK1.0_INCLUDE_DIRS} )
-                        SET ( LIBEDATABOOK1.0_LIBRARIES ${LIBEDATABOOK1.0_LIBRARIES} ${LIBEBOOK1.0_LIBRARIES} )
-                ENDIF ( LIBEBOOK1.0_FOUND )            
-       ENDIF ( NOT LIBEBOOK1.0_FOUND )
-       IF ( NOT LIBEDATASERVER1.0_FOUND )
-               FIND_PACKAGE ( EDataServer1.0 REQUIRED )
-                IF ( LIBEDATASERVER1.0_FOUND )
-                        SET ( LIBEDATABOOK1.0_INCLUDE_DIRS ${LIBEDATABOOK1.0_INCLUDE_DIRS} ${LIBEDATASERVER1.0_INCLUDE_DIRS} )
-                        SET ( LIBEDATABOOK1.0_LIBRARIES ${LIBEDATABOOK1.0_LIBRARIES} ${LIBEDATASERVER1.0_LIBRARIES} )
-                ENDIF ( LIBEDATASERVER1.0_FOUND )              
-       ENDIF ( NOT LIBEDATASERVER1.0_FOUND )
-       IF ( NOT LIBGNOME2_FOUND )
-               FIND_PACKAGE ( LibGnome2 REQUIRED )
-                IF ( LIBGNOME2_FOUND )
-                        SET ( LIBEDATABOOK1.0_INCLUDE_DIRS ${LIBEDATABOOK1.0_INCLUDE_DIRS} ${LIBGNOME2_INCLUDE_DIRS} )
-                        SET ( LIBEDATABOOK1.0_LIBRARIES ${LIBEDATABOOK1.0_LIBRARIES} ${LIBGNOME2_LIBRARIES} )
-                ENDIF ( LIBGNOME2_FOUND )              
-       ENDIF ( NOT LIBGNOME2_FOUND )
-       IF ( NOT BONOBO2_FOUND )
-               SET ( BONOBO2_MIN_VERSION "2.4.2" )
-               FIND_PACKAGE ( BONOBO2 REQUIRED )
-                IF ( BONOBO2_FOUND )
-                        SET ( LIBEDATABOOK1.0_INCLUDE_DIRS ${LIBEDATABOOK1.0_INCLUDE_DIRS} ${BONOBO2_INCLUDE_DIRS} )
-                        SET ( LIBEDATABOOK1.0_LIBRARIES ${LIBEDATABOOK1.0_LIBRARIES} ${BONOBO2_LIBRARIES} )
-                ENDIF ( BONOBO2_FOUND )                
-       ENDIF ( NOT BONOBO2_FOUND )
-
-       # Report results
-       IF ( LIBEDATABOOK1.0_LIBRARIES AND LIBEDATABOOK1.0_INCLUDE_DIRS AND _libedatabook1.0_FOUND )
-               SET( LIBEDATABOOK1.0_FOUND 1 )
-               IF ( NOT EDataBook1.0_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libedatabook-1.0: ${LIBEDATABOOK1.0_LIBRARIES}" )
-               ENDIF ( NOT EDataBook1.0_FIND_QUIETLY )
-       ELSE ( LIBEDATABOOK1.0_LIBRARIES AND LIBEDATABOOK1.0_INCLUDE_DIRS AND _libedatabook1.0_FOUND )  
-               IF ( EDataBook1.0_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libedatabook-1.0" )
-               ELSE ( EDataBook1.0_FIND_REQUIRED )
-                       IF ( NOT EDataBook1.0_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libedatabook-1.0" )     
-                       ENDIF ( NOT EDataBook1.0_FIND_QUIETLY )
-               ENDIF ( EDataBook1.0_FIND_REQUIRED )
-       ENDIF ( LIBEDATABOOK1.0_LIBRARIES AND LIBEDATABOOK1.0_INCLUDE_DIRS AND _libedatabook1.0_FOUND ) 
-
-ENDIF ( NOT LIBEDATABOOK1.0_FOUND AND NOT PKG_CONFIG_FOUND )
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBEDATABOOK1.0_LIBRARIES LIBEDATABOOK1.0_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindEDataBook1.2.cmake b/cmake/modules/FindEDataBook1.2.cmake
deleted file mode 100644 (file)
index 22381f9..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-# - Try to find libedatabook1.2 components
-# Find libedatabook 1.2 headers, libraries and the answer to all questions.
-#
-#  LIBEDATABOOK1.2_FOUND               True if libedatabook1.2 got found
-#  LIBEDATABOOK1.2_INCLUDE_DIRS         Location of libedatabook1.2 headers 
-#  LIBEDATABOOK1.2_LIBRARIES           List of libaries to use libedatabook1.2
-#  LIBEDATABOOK1.2_DEFINITIONS         Definitions to compile libedatabook1.2 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about libedata-book-1.2.pc settings
-IF ( EDataBook1.2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( EDataBook1.2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( EDataBook1.2_FIND_REQUIRED )
-
-pkg_search_module( LIBEDATABOOK1.2 ${_pkgconfig_REQUIRED} libedata-book-1.2 )
-
-
-# Look for libedatabook1.2 include dir and libraries w/o pkg-config.
-IF ( NOT LIBEDATABOOK1.2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libedatabook1.2_include_DIR libedata-book/e-data-book.h 
-                       PATH_SUFFIXES evolution-data-server-1.12 evolution-data-server-1.10 evolution-data-server-1.8 evolution-data-server-1.6 evolution-data-server-1.4 evolution-data-server-1.2
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ 
-       )
-       FIND_LIBRARY( _libedatabook1.2_link_DIR edata-book-1.2
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 
-       )
-
-        IF ( _libedatabook1.2_include_DIR AND _libedatabook1.2_link_DIR )
-                SET ( _libedatabook1.2_FOUND TRUE )
-        ENDIF ( _libedatabook1.2_include_DIR AND _libedatabook1.2_link_DIR )
-
-
-        IF ( _libedatabook1.2_FOUND )
-                SET ( LIBEDATABOOK1.2_INCLUDE_DIRS ${_libedatabook1.2_include_DIR} )
-                SET ( LIBEDATABOOK1.2_LIBRARIES ${_libedatabook1.2_link_DIR} )
-        ENDIF ( _libedatabook1.2_FOUND )
-
-        # Handle dependencies
-       IF ( NOT LIBEBOOK1.2_FOUND )
-               FIND_PACKAGE ( EBook1.2 REQUIRED )
-                IF ( LIBEBOOK1.2_FOUND )
-                        SET ( LIBEDATABOOK1.2_INCLUDE_DIRS ${LIBEDATABOOK1.2_INCLUDE_DIRS} ${LIBEBOOK1.2_INCLUDE_DIRS} )
-                        SET ( LIBEDATABOOK1.2_LIBRARIES ${LIBEDATABOOK1.2_LIBRARIES} ${LIBEBOOK1.2_LIBRARIES} )
-                ENDIF ( LIBEBOOK1.2_FOUND )            
-       ENDIF ( NOT LIBEBOOK1.2_FOUND )
-       IF ( NOT LIBEDATASERVER1.2_FOUND )
-               FIND_PACKAGE ( EDataServer1.2 REQUIRED )
-                IF ( LIBEDATASERVER1.2_FOUND )
-                        SET ( LIBEDATABOOK1.2_INCLUDE_DIRS ${LIBEDATABOOK1.2_INCLUDE_DIRS} ${LIBEDATASERVER1.2_INCLUDE_DIRS} )
-                        SET ( LIBEDATABOOK1.2_LIBRARIES ${LIBEDATABOOK1.2_LIBRARIES} ${LIBEDATASERVER1.2_LIBRARIES} )
-                ENDIF ( LIBEDATASERVER1.2_FOUND )              
-       ENDIF ( NOT LIBEDATASERVER1.2_FOUND )
-       IF ( NOT LIBGNOME2_FOUND )
-               FIND_PACKAGE ( LibGnome2 REQUIRED )
-                IF ( LIBGNOME2_FOUND )
-                        SET ( LIBEDATABOOK1.2_INCLUDE_DIRS ${LIBEDATABOOK1.2_INCLUDE_DIRS} ${LIBGNOME2_INCLUDE_DIRS} )
-                        SET ( LIBEDATABOOK1.2_LIBRARIES ${LIBEDATABOOK1.2_LIBRARIES} ${LIBGNOME2_LIBRARIES} )
-                ENDIF ( LIBGNOME2_FOUND )              
-       ENDIF ( NOT LIBGNOME2_FOUND )
-       IF ( NOT BONOBO2_FOUND )
-               SET ( BONOBO2_MIN_VERSION "2.4.2" )
-               FIND_PACKAGE ( BONOBO2 REQUIRED )
-                IF ( BONOBO2_FOUND )
-                        SET ( LIBEDATABOOK1.2_INCLUDE_DIRS ${LIBEDATABOOK1.2_INCLUDE_DIRS} ${BONOBO2_INCLUDE_DIRS} )
-                        SET ( LIBEDATABOOK1.2_LIBRARIES ${LIBEDATABOOK1.2_LIBRARIES} ${BONOBO2_LIBRARIES} )
-                ENDIF ( BONOBO2_FOUND )                
-       ENDIF ( NOT BONOBO2_FOUND )
-
-       # Report results
-       IF ( LIBEDATABOOK1.2_LIBRARIES AND LIBEDATABOOK1.2_INCLUDE_DIRS AND _libedatabook1.2_FOUND )
-               SET( LIBEDATABOOK1.2_FOUND 1 )
-               IF ( NOT EDataBook1.2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libedatabook-1.2: ${LIBEDATABOOK1.2_LIBRARIES}" )
-               ENDIF ( NOT EDataBook1.2_FIND_QUIETLY )
-       ELSE ( LIBEDATABOOK1.2_LIBRARIES AND LIBEDATABOOK1.2_INCLUDE_DIRS AND _libedatabook1.2_FOUND )  
-               IF ( EDataBook1.2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libedatabook-1.2" )
-               ELSE ( EDataBook1.2_FIND_REQUIRED )
-                       IF ( NOT EDataBook1.2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libedatabook-1.2" )     
-                       ENDIF ( NOT EDataBook1.2_FIND_QUIETLY )
-               ENDIF ( EDataBook1.2_FIND_REQUIRED )
-       ENDIF ( LIBEDATABOOK1.2_LIBRARIES AND LIBEDATABOOK1.2_INCLUDE_DIRS AND _libedatabook1.2_FOUND ) 
-
-ENDIF ( NOT LIBEDATABOOK1.2_FOUND AND NOT PKG_CONFIG_FOUND )
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBEDATABOOK1.2_LIBRARIES LIBEDATABOOK1.2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindEDataCal1.0.cmake b/cmake/modules/FindEDataCal1.0.cmake
deleted file mode 100644 (file)
index 82044d2..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-# - Try to find libedatacal1.0 components
-# Find libedatacal 1.0 headers, libraries and the answer to all questions.
-#
-#  LIBEDATACAL1.0_FOUND               True if libedatacal1.0 got found
-#  LIBEDATACAL1.0_INCLUDE_DIRS         Location of libedatacal1.0 headers 
-#  LIBEDATACAL1.0_LIBRARIES           List of libaries to use libedatacal1.0
-#  LIBEDATACAL1.0_DEFINITIONS         Definitions to compile libedatacal1.0 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about libedata-cal-1.0.pc settings
-IF ( EDataCal1.0_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( EDataCal1.0_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( EDataCal1.0_FIND_REQUIRED )
-
-pkg_search_module( LIBEDATACAL1.0 ${_pkgconfig_REQUIRED} libedata-cal-1.0 )
-
-
-# Look for libedatacal1.0 include dir and libraries w/o pkg-config.
-IF ( NOT LIBEDATACAL1.0_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libedatacal1.0_include_DIR libedata-cal/e-data-cal.h 
-                       PATH_SUFFIXES evolution-data-server-1.12 evolution-data-server-1.10 evolution-data-server-1.8 evolution-data-server-1.6 evolution-data-server-1.4 evolution-data-server-1.0
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ 
-       )
-       FIND_LIBRARY( _libedatacal1.0_link_DIR edata-cal-1.0
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 
-       )
-
-        IF ( _libedatacal1.0_include_DIR AND _libedatacal1.0_link_DIR )
-                SET ( _libedatacal1.0_FOUND TRUE )
-        ENDIF ( _libedatacal1.0_include_DIR AND _libedatacal1.0_link_DIR )
-
-
-        IF ( _libedatacal1.0_FOUND )
-                SET ( LIBEDATACAL1.0_INCLUDE_DIRS ${_libedatacal1.0_include_DIR} )
-                SET ( LIBEDATACAL1.0_LIBRARIES ${_libedatacal1.0_link_DIR} )
-        ENDIF ( _libedatacal1.0_FOUND )
-
-        # Handle dependencies
-       IF ( NOT LIBECAL1.0_FOUND )
-               FIND_PACKAGE ( ECal1.0 REQUIRED )
-                IF ( LIBECAL1.0_FOUND )
-                        SET ( LIBEDATACAL1.0_INCLUDE_DIRS ${LIBEDATACAL1.0_INCLUDE_DIRS} ${LIBECAL1.0_INCLUDE_DIRS} )
-                        SET ( LIBEDATACAL1.0_LIBRARIES ${LIBEDATACAL1.0_LIBRARIES} ${LIBECAL1.0_LIBRARIES} )
-                ENDIF ( LIBECAL1.0_FOUND )             
-       ENDIF ( NOT LIBECAL1.0_FOUND )
-       IF ( NOT GNOMEVFS2_FOUND )
-               FIND_PACKAGE ( GnomeVfs2 REQUIRED )
-                IF ( GNOMEVFS2_FOUND )
-                        SET ( LIBEDATACAL1.0_INCLUDE_DIRS ${LIBEDATACAL1.0_INCLUDE_DIRS} ${GNOMEVFS2_INCLUDE_DIRS} )
-                        SET ( LIBEDATACAL1.0_LIBRARIES ${LIBEDATACAL1.0_LIBRARIES} ${GNOMEVFS2_LIBRARIES} )
-                ENDIF ( GNOMEVFS2_FOUND )              
-       ENDIF ( NOT GNOMEVFS2_FOUND )
-       IF ( NOT LIBEDATASERVER1.0_FOUND )
-               FIND_PACKAGE ( EDataServer1.0 REQUIRED )
-                IF ( LIBEDATASERVER1.0_FOUND )
-                        SET ( LIBEDATACAL1.0_INCLUDE_DIRS ${LIBEDATACAL1.0_INCLUDE_DIRS} ${LIBEDATASERVER1.0_INCLUDE_DIRS} )
-                        SET ( LIBEDATACAL1.0_LIBRARIES ${LIBEDATACAL1.0_LIBRARIES} ${LIBEDATASERVER1.0_LIBRARIES} )
-                ENDIF ( LIBEDATASERVER1.0_FOUND )              
-       ENDIF ( NOT LIBEDATASERVER1.0_FOUND )
-       IF ( NOT LIBGNOME2_FOUND )
-               FIND_PACKAGE ( LibGnome2 REQUIRED )
-                IF ( LIBGNOME2_FOUND )
-                        SET ( LIBEDATACAL1.0_INCLUDE_DIRS ${LIBEDATACAL1.0_INCLUDE_DIRS} ${LIBGNOME2_INCLUDE_DIRS} )
-                        SET ( LIBEDATACAL1.0_LIBRARIES ${LIBEDATACAL1.0_LIBRARIES} ${LIBGNOME2_LIBRARIES} )
-                ENDIF ( LIBGNOME2_FOUND )              
-       ENDIF ( NOT LIBGNOME2_FOUND )
-       IF ( NOT BONOBO2_FOUND )
-               SET ( BONOBO2_MIN_VERSION "2.4.2" )
-               FIND_PACKAGE ( BONOBO2 REQUIRED )
-                IF ( BONOBO2_FOUND )
-                        SET ( LIBEDATACAL1.0_INCLUDE_DIRS ${LIBEDATACAL1.0_INCLUDE_DIRS} ${BONOBO2_INCLUDE_DIRS} )
-                        SET ( LIBEDATACAL1.0_LIBRARIES ${LIBEDATACAL1.0_LIBRARIES} ${BONOBO2_LIBRARIES} )
-                ENDIF ( BONOBO2_FOUND )                
-       ENDIF ( NOT BONOBO2_FOUND )
-
-       # Report results
-       IF ( LIBEDATACAL1.0_LIBRARIES AND LIBEDATACAL1.0_INCLUDE_DIRS AND _libedatacal1.0_FOUND )
-               SET( LIBEDATACAL1.0_FOUND 1 )
-               IF ( NOT EDataCal1.0_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libedatacal-1.0: ${LIBEDATACAL1.0_LIBRARIES}" )
-               ENDIF ( NOT EDataCal1.0_FIND_QUIETLY )
-       ELSE ( LIBEDATACAL1.0_LIBRARIES AND LIBEDATACAL1.0_INCLUDE_DIRS AND _libedatacal1.0_FOUND )     
-               IF ( EDataCal1.0_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libedatacal-1.0" )
-               ELSE ( EDataCal1.0_FIND_REQUIRED )
-                       IF ( NOT EDataCal1.0_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libedatacal-1.0" )      
-                       ENDIF ( NOT EDataCal1.0_FIND_QUIETLY )
-               ENDIF ( EDataCal1.0_FIND_REQUIRED )
-       ENDIF ( LIBEDATACAL1.0_LIBRARIES AND LIBEDATACAL1.0_INCLUDE_DIRS AND _libedatacal1.0_FOUND )    
-
-ENDIF ( NOT LIBEDATACAL1.0_FOUND AND NOT PKG_CONFIG_FOUND )
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBEDATACAL1.0_LIBRARIES LIBEDATACAL1.0_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindEDataCal1.2.cmake b/cmake/modules/FindEDataCal1.2.cmake
deleted file mode 100644 (file)
index 5f209b8..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-# - Try to find libedatacal1.2 components
-# Find libedatacal 1.2 headers, libraries and the answer to all questions.
-#
-#  LIBEDATACAL1.2_FOUND               True if libedatacal1.2 got found
-#  LIBEDATACAL1.2_INCLUDE_DIRS         Location of libedatacal1.2 headers 
-#  LIBEDATACAL1.2_LIBRARIES           List of libaries to use libedatacal1.2
-#  LIBEDATACAL1.2_DEFINITIONS         Definitions to compile libedatacal1.2 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about libedata-cal-1.2.pc settings
-IF ( EDataCal1.2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( EDataCal1.2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( EDataCal1.2_FIND_REQUIRED )
-
-pkg_search_module( LIBEDATACAL1.2 ${_pkgconfig_REQUIRED} libedata-cal-1.2 )
-
-
-# Look for libedatacal1.2 include dir and libraries w/o pkg-config.
-IF ( NOT LIBEDATACAL1.2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libedatacal1.2_include_DIR libedata-cal/e-data-cal.h 
-                       PATH_SUFFIXES evolution-data-server-1.12 evolution-data-server-1.10 evolution-data-server-1.8 evolution-data-server-1.6 evolution-data-server-1.4 evolution-data-server-1.2
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ 
-       )
-       FIND_LIBRARY( _libedatacal1.2_link_DIR edata-cal-1.2
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 
-       )
-
-        IF ( _libedatacal1.2_include_DIR AND _libedatacal1.2_link_DIR )
-                SET ( _libedatacal1.2_FOUND TRUE )
-        ENDIF ( _libedatacal1.2_include_DIR AND _libedatacal1.2_link_DIR )
-
-
-        IF ( _libedatacal1.2_FOUND )
-                SET ( LIBEDATACAL1.2_INCLUDE_DIRS ${_libedatacal1.2_include_DIR} )
-                SET ( LIBEDATACAL1.2_LIBRARIES ${_libedatacal1.2_link_DIR} )
-        ENDIF ( _libedatacal1.2_FOUND )
-
-        # Handle dependencies
-       IF ( NOT LIBECAL1.2_FOUND )
-               FIND_PACKAGE ( ECal1.2 REQUIRED )
-                IF ( LIBECAL1.2_FOUND )
-                        SET ( LIBEDATACAL1.2_INCLUDE_DIRS ${LIBEDATACAL1.2_INCLUDE_DIRS} ${LIBECAL1.2_INCLUDE_DIRS} )
-                        SET ( LIBEDATACAL1.2_LIBRARIES ${LIBEDATACAL1.2_LIBRARIES} ${LIBECAL1.2_LIBRARIES} )
-                ENDIF ( LIBECAL1.2_FOUND )             
-       ENDIF ( NOT LIBECAL1.2_FOUND )
-       IF ( NOT GNOMEVFS2_FOUND )
-               FIND_PACKAGE ( GnomeVfs2 REQUIRED )
-                IF ( GNOMEVFS2_FOUND )
-                        SET ( LIBEDATACAL1.2_INCLUDE_DIRS ${LIBEDATACAL1.2_INCLUDE_DIRS} ${GNOMEVFS2_INCLUDE_DIRS} )
-                        SET ( LIBEDATACAL1.2_LIBRARIES ${LIBEDATACAL1.2_LIBRARIES} ${GNOMEVFS2_LIBRARIES} )
-                ENDIF ( GNOMEVFS2_FOUND )              
-       ENDIF ( NOT GNOMEVFS2_FOUND )
-       IF ( NOT LIBEDATASERVER1.2_FOUND )
-               FIND_PACKAGE ( EDataServer1.2 REQUIRED )
-                IF ( LIBEDATASERVER1.2_FOUND )
-                        SET ( LIBEDATACAL1.2_INCLUDE_DIRS ${LIBEDATACAL1.2_INCLUDE_DIRS} ${LIBEDATASERVER1.2_INCLUDE_DIRS} )
-                        SET ( LIBEDATACAL1.2_LIBRARIES ${LIBEDATACAL1.2_LIBRARIES} ${LIBEDATASERVER1.2_LIBRARIES} )
-                ENDIF ( LIBEDATASERVER1.2_FOUND )              
-       ENDIF ( NOT LIBEDATASERVER1.2_FOUND )
-       IF ( NOT LIBGNOME2_FOUND )
-               FIND_PACKAGE ( LibGnome2 REQUIRED )
-                IF ( LIBGNOME2_FOUND )
-                        SET ( LIBEDATACAL1.2_INCLUDE_DIRS ${LIBEDATACAL1.2_INCLUDE_DIRS} ${LIBGNOME2_INCLUDE_DIRS} )
-                        SET ( LIBEDATACAL1.2_LIBRARIES ${LIBEDATACAL1.2_LIBRARIES} ${LIBGNOME2_LIBRARIES} )
-                ENDIF ( LIBGNOME2_FOUND )              
-       ENDIF ( NOT LIBGNOME2_FOUND )
-       IF ( NOT BONOBO2_FOUND )
-               SET ( BONOBO2_MIN_VERSION "2.4.2" )
-               FIND_PACKAGE ( BONOBO2 REQUIRED )
-                IF ( BONOBO2_FOUND )
-                        SET ( LIBEDATACAL1.2_INCLUDE_DIRS ${LIBEDATACAL1.2_INCLUDE_DIRS} ${BONOBO2_INCLUDE_DIRS} )
-                        SET ( LIBEDATACAL1.2_LIBRARIES ${LIBEDATACAL1.2_LIBRARIES} ${BONOBO2_LIBRARIES} )
-                ENDIF ( BONOBO2_FOUND )                
-       ENDIF ( NOT BONOBO2_FOUND )
-
-       # Report results
-       IF ( LIBEDATACAL1.2_LIBRARIES AND LIBEDATACAL1.2_INCLUDE_DIRS AND _libedatacal1.2_FOUND )
-               SET( LIBEDATACAL1.2_FOUND 1 )
-               IF ( NOT EDataCal1.2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libedatacal-1.2: ${LIBEDATACAL1.2_LIBRARIES}" )
-               ENDIF ( NOT EDataCal1.2_FIND_QUIETLY )
-       ELSE ( LIBEDATACAL1.2_LIBRARIES AND LIBEDATACAL1.2_INCLUDE_DIRS AND _libedatacal1.2_FOUND )     
-               IF ( EDataCal1.2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libedatacal-1.2" )
-               ELSE ( EDataCal1.2_FIND_REQUIRED )
-                       IF ( NOT EDataCal1.2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libedatacal-1.2" )      
-                       ENDIF ( NOT EDataCal1.2_FIND_QUIETLY )
-               ENDIF ( EDataCal1.2_FIND_REQUIRED )
-       ENDIF ( LIBEDATACAL1.2_LIBRARIES AND LIBEDATACAL1.2_INCLUDE_DIRS AND _libedatacal1.2_FOUND )    
-
-ENDIF ( NOT LIBEDATACAL1.2_FOUND AND NOT PKG_CONFIG_FOUND )
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBEDATACAL1.2_LIBRARIES LIBEDATACAL1.2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindEDataServer1.0.cmake b/cmake/modules/FindEDataServer1.0.cmake
deleted file mode 100644 (file)
index 9b64083..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-# - Try to find libedataserver1.0 components
-# Find libedataserver 1.0 headers, libraries and the answer to all questions.
-#
-#  LIBEDATASERVER1.0_FOUND               True if libedataserver1.0 got found
-#  LIBEDATASERVER1.0_INCLUDE_DIRS         Location of libedataserver1.0 headers 
-#  LIBEDATASERVER1.0_LIBRARIES           List of libaries to use libedataserver1.0
-#  LIBEDATASERVER1.0_DEFINITIONS         Definitions to compile libedataserver1.0 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about libedataserver-1.0.pc settings
-IF ( EDataServer1.0_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( EDataServer1.0_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( EDataServer1.0_FIND_REQUIRED )
-
-pkg_search_module( LIBEDATASERVER1.0 ${_pkgconfig_REQUIRED} libedataserver-1.0 )
-
-
-# Look for libedataserver1.0 include dir and libraries w/o pkg-config.
-IF ( NOT LIBEDATASERVER1.0_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libedataserver1.0_include_DIR libedataserver/e-account.h 
-                       PATH_SUFFIXES evolution-data-server-1.12 evolution-data-server-1.10 evolution-data-server-1.8 evolution-data-server-1.6 evolution-data-server-1.4 evolution-data-server-1.0
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ 
-       )
-       FIND_LIBRARY( _libedataserver1.0_link_DIR edataserver-1.0
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 
-       )
-
-        IF ( _libedataserver1.0_include_DIR AND _libedataserver1.0_link_DIR )
-                SET ( _libedataserver1.0_FOUND TRUE )
-        ENDIF ( _libedataserver1.0_include_DIR AND _libedataserver1.0_link_DIR )
-
-
-        IF ( _libedataserver1.0_FOUND )
-                SET ( LIBEDATASERVER1.0_INCLUDE_DIRS ${_libedataserver1.0_include_DIR} )
-                SET ( LIBEDATASERVER1.0_LIBRARIES ${_libedataserver1.0_link_DIR} )
-        ENDIF ( _libedataserver1.0_FOUND )
-
-
-        # Handle dependencies
-       IF ( NOT GCONF2_FOUND )
-               FIND_PACKAGE ( GConf2 REQUIRED )
-                IF ( GCONF2_FOUND )
-                        SET ( LIBEDATASERVER1.0_INCLUDE_DIRS ${LIBEDATASERVER1.0_INCLUDE_DIRS} ${GCONF2_INCLUDE_DIRS} )
-                        SET ( LIBEDATASERVER1.0_LIBRARIES ${LIBEDATASERVER1.0_LIBRARIES} ${GCONF2_LIBRARIES} )
-                ENDIF ( GCONF2_FOUND )         
-       ENDIF ( NOT GCONF2_FOUND )
-       IF ( NOT BONOBO2_FOUND )
-               SET ( BONOBO2_MIN_VERSION "2.4.2" )
-               FIND_PACKAGE ( BONOBO2 REQUIRED )
-                IF ( BONOBO2_FOUND )
-                        SET ( LIBEDATASERVER1.0_INCLUDE_DIRS ${LIBEDATASERVER1.0_INCLUDE_DIRS} ${BONOBO2_INCLUDE_DIRS} )
-                        SET ( LIBEDATASERVER1.0_LIBRARIES ${LIBEDATASERVER1.0_LIBRARIES} ${BONOBO2_LIBRARIES} )
-                ENDIF ( BONOBO2_FOUND )                
-       ENDIF ( NOT BONOBO2_FOUND )
-       IF ( NOT ORBIT2_FOUND )
-               SET ( ORBIT2_MIN_VERSION "2.9.8" )
-               FIND_PACKAGE ( ORBit2 REQUIRED )
-                IF ( ORBIT2_FOUND )
-                        SET ( LIBEDATASERVER1.0_INCLUDE_DIRS ${LIBEDATASERVER1.0_INCLUDE_DIRS} ${ORBIT2_INCLUDE_DIRS} )
-                        SET ( LIBEDATASERVER1.0_LIBRARIES ${LIBEDATASERVER1.0_LIBRARIES} ${ORBIT2_LIBRARIES} )
-                ENDIF ( ORBIT2_FOUND )         
-       ENDIF ( NOT ORBIT2_FOUND )
-       IF ( NOT LIBXML2_FOUND )
-               FIND_PACKAGE ( LibXml2 REQUIRED )
-                IF ( LIBXML2_FOUND )
-                        SET ( LIBEDATASERVER1.0_INCLUDE_DIRS ${LIBEDATASERVER1.0_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} )
-                        SET ( LIBEDATASERVER1.0_LIBRARIES ${LIBEDATASERVER1.0_LIBRARIES} ${LIBXML2_LIBRARY} )
-                ENDIF ( LIBXML2_FOUND )                
-       ENDIF ( NOT LIBXML2_FOUND )
-       IF ( NOT GLIB2_FOUND )
-               FIND_PACKAGE ( GLIB2 REQUIRED )
-                IF ( GLIB2_FOUND )
-                        SET ( LIBEDATASERVER1.0_INCLUDE_DIRS ${LIBEDATASERVER1.0_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${GLIBCONFIG_INCLUDE_DIR} )
-                        SET ( LIBEDATASERVER1.0_LIBRARIES ${LIBEDATASERVER1.0_LIBRARIES} ${GLIB2_LIBRARIES} )
-                ENDIF ( GLIB2_FOUND )          
-       ENDIF ( NOT GLIB2_FOUND )
-
-       # Report results
-       IF ( LIBEDATASERVER1.0_LIBRARIES AND LIBEDATASERVER1.0_INCLUDE_DIRS AND _libedataserver1.0_FOUND )
-               SET( LIBEDATASERVER1.0_FOUND 1 )
-               IF ( NOT LibEDataServer1.0_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libedataserver-1.0: ${LIBEDATASERVER1.0_LIBRARIES}" )
-               ENDIF ( NOT LibEDataServer1.0_FIND_QUIETLY )
-       ELSE ( LIBEDATASERVER1.0_LIBRARIES AND LIBEDATASERVER1.0_INCLUDE_DIRS AND _libedataserver1.0_FOUND )    
-               IF ( LibEDataServer1.0_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libedataserver-1.0" )
-               ELSE ( LibEDataServer1.0_FIND_REQUIRED )
-                       IF ( NOT LibEDataServer1.0_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libedataserver-1.0" )   
-                       ENDIF ( NOT LibEDataServer1.0_FIND_QUIETLY )
-               ENDIF ( LibEDataServer1.0_FIND_REQUIRED )
-       ENDIF ( LIBEDATASERVER1.0_LIBRARIES AND LIBEDATASERVER1.0_INCLUDE_DIRS AND _libedataserver1.0_FOUND )   
-
-ENDIF ( NOT LIBEDATASERVER1.0_FOUND AND NOT PKG_CONFIG_FOUND )
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBEDATASERVER1.0_LIBRARIES LIBEDATASERVER1.0_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindEDataServer1.2.cmake b/cmake/modules/FindEDataServer1.2.cmake
deleted file mode 100644 (file)
index a5a4140..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-# - Try to find libedataserver1.2 components
-# Find libedataserver 1.2 headers, libraries and the answer to all questions.
-#
-#  LIBEDATASERVER1.2_FOUND               True if libedataserver1.2 got found
-#  LIBEDATASERVER1.2_INCLUDE_DIRS         Location of libedataserver1.2 headers 
-#  LIBEDATASERVER1.2_LIBRARIES           List of libaries to use libedataserver1.2
-#  LIBEDATASERVER1.2_DEFINITIONS         Definitions to compile libedataserver1.2 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about libedataserver-1.2.pc settings
-IF ( EDataServer1.2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( EDataServer1.2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( EDataServer1.2_FIND_REQUIRED )
-
-pkg_search_module( LIBEDATASERVER1.2 ${_pkgconfig_REQUIRED} libedataserver-1.2 )
-
-
-# Look for libedataserver1.2 include dir and libraries w/o pkg-config.
-IF ( NOT LIBEDATASERVER1.2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libedataserver1.2_include_DIR libedataserver/e-account.h 
-                       PATH_SUFFIXES evolution-data-server-1.12 evolution-data-server-1.10 evolution-data-server-1.8 evolution-data-server-1.6 evolution-data-server-1.4 evolution-data-server-1.2
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ 
-       )
-       FIND_LIBRARY( _libedataserver1.2_link_DIR edataserver-1.2
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 
-       )
-
-        IF ( _libedataserver1.2_include_DIR AND _libedataserver1.2_link_DIR )
-                SET ( _libedataserver1.2_FOUND TRUE )
-        ENDIF ( _libedataserver1.2_include_DIR AND _libedataserver1.2_link_DIR )
-
-
-        IF ( _libedataserver1.2_FOUND )
-                SET ( LIBEDATASERVER1.2_INCLUDE_DIRS ${_libedataserver1.2_include_DIR} )
-                SET ( LIBEDATASERVER1.2_LIBRARIES ${_libedataserver1.2_link_DIR} )
-        ENDIF ( _libedataserver1.2_FOUND )
-
-
-        # Handle dependencies
-       IF ( NOT GCONF2_FOUND )
-               FIND_PACKAGE ( GConf2 REQUIRED )
-                IF ( GCONF2_FOUND )
-                        SET ( LIBEDATASERVER1.2_INCLUDE_DIRS ${LIBEDATASERVER1.2_INCLUDE_DIRS} ${GCONF2_INCLUDE_DIRS} )
-                        SET ( LIBEDATASERVER1.2_LIBRARIES ${LIBEDATASERVER1.2_LIBRARIES} ${GCONF2_LIBRARIES} )
-                ENDIF ( GCONF2_FOUND )         
-       ENDIF ( NOT GCONF2_FOUND )
-       IF ( NOT BONOBO2_FOUND )
-               SET ( BONOBO2_MIN_VERSION "2.4.2" )
-               FIND_PACKAGE ( BONOBO2 REQUIRED )
-                IF ( BONOBO2_FOUND )
-                        SET ( LIBEDATASERVER1.2_INCLUDE_DIRS ${LIBEDATASERVER1.2_INCLUDE_DIRS} ${BONOBO2_INCLUDE_DIRS} )
-                        SET ( LIBEDATASERVER1.2_LIBRARIES ${LIBEDATASERVER1.2_LIBRARIES} ${BONOBO2_LIBRARIES} )
-                ENDIF ( BONOBO2_FOUND )                
-       ENDIF ( NOT BONOBO2_FOUND )
-       IF ( NOT ORBIT2_FOUND )
-               SET ( ORBIT2_MIN_VERSION "2.9.8" )
-               FIND_PACKAGE ( ORBit2 REQUIRED )
-                IF ( ORBIT2_FOUND )
-                        SET ( LIBEDATASERVER1.2_INCLUDE_DIRS ${LIBEDATASERVER1.2_INCLUDE_DIRS} ${ORBIT2_INCLUDE_DIRS} )
-                        SET ( LIBEDATASERVER1.2_LIBRARIES ${LIBEDATASERVER1.2_LIBRARIES} ${ORBIT2_LIBRARIES} )
-                ENDIF ( ORBIT2_FOUND )         
-       ENDIF ( NOT ORBIT2_FOUND )
-       IF ( NOT LIBXML2_FOUND )
-               FIND_PACKAGE ( LibXml2 REQUIRED )
-                IF ( LIBXML2_FOUND )
-                        SET ( LIBEDATASERVER1.2_INCLUDE_DIRS ${LIBEDATASERVER1.2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} )
-                        SET ( LIBEDATASERVER1.2_LIBRARIES ${LIBEDATASERVER1.2_LIBRARIES} ${LIBXML2_LIBRARIES} )
-                ENDIF ( LIBXML2_FOUND )                
-       ENDIF ( NOT LIBXML2_FOUND )
-       IF ( NOT GLIB2_FOUND )
-               FIND_PACKAGE ( GLIB2 REQUIRED )
-                IF ( GLIB2_FOUND )
-                        SET ( LIBEDATASERVER1.2_INCLUDE_DIRS ${LIBEDATASERVER1.2_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${GLIBCONFIG_INCLUDE_DIR} )
-                        SET ( LIBEDATASERVER1.2_LIBRARIES ${LIBEDATASERVER1.2_LIBRARIES} ${GLIB2_LIBRARIES} )
-                ENDIF ( GLIB2_FOUND )          
-       ENDIF ( NOT GLIB2_FOUND )
-
-       # Report results
-       IF ( LIBEDATASERVER1.2_LIBRARIES AND LIBEDATASERVER1.2_INCLUDE_DIRS AND _libedataserver1.2_FOUND )
-               SET( LIBEDATASERVER1.2_FOUND 1 )
-               IF ( NOT LibEDataServer1.2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libedataserver-1.2: ${LIBEDATASERVER1.2_LIBRARIES}" )
-               ENDIF ( NOT LibEDataServer1.2_FIND_QUIETLY )
-       ELSE ( LIBEDATASERVER1.2_LIBRARIES AND LIBEDATASERVER1.2_INCLUDE_DIRS AND _libedataserver1.2_FOUND )    
-               IF ( LibEDataServer1.2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libedataserver-1.2" )
-               ELSE ( LibEDataServer1.2_FIND_REQUIRED )
-                       IF ( NOT LibEDataServer1.2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libedataserver-1.2" )   
-                       ENDIF ( NOT LibEDataServer1.2_FIND_QUIETLY )
-               ENDIF ( LibEDataServer1.2_FIND_REQUIRED )
-       ENDIF ( LIBEDATASERVER1.2_LIBRARIES AND LIBEDATASERVER1.2_INCLUDE_DIRS AND _libedataserver1.2_FOUND )   
-
-ENDIF ( NOT LIBEDATASERVER1.2_FOUND AND NOT PKG_CONFIG_FOUND )
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBEDATASERVER1.2_LIBRARIES LIBEDATASERVER1.2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindEPackage.cmake b/cmake/modules/FindEPackage.cmake
deleted file mode 100644 (file)
index 1e34124..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-# - Try to find evolution-data-server components
-# Set evolution-data-server headers, libraries and the answer to all questions.
-#
-#  EVOLUTIONDATASERVER_INCLUDE_DIRS         Location of evolution-data-server headers 
-#  EVOLUTIONDATASERVER_LIBRARIES           List of libraries to use evolution-data-server
-#  EVOLUTIONDATASERVER_LIBRARY_DIRS           Pathes of libraries to use evolution-data-server
-#  EVOLUTIONDATASERVER_LDFLAGS           List of link flags to use evolution-data-server
-#
-#  LIBEBOOK_INCLUDE_DIRS         Location of libebook headers 
-#  LIBEBOOK_LIBRARIES           List of libraries to use libebook
-#  LIBEBOOK_LIBRARY_DIRS           Pathes of libraries to use libebook
-#  LIBEBOOK_LDFLAGS           List of link flags to use libebook
-#
-#  LIBECAL_INCLUDE_DIRS         Location of libecal headers 
-#  LIBECAL_LIBRARIES           List of libraries to use libecal
-#  LIBECAL_LIBRARY_DIRS           Pathes of libraries to use libecal
-#  LIBECAL_LDFLAGS           List of link flags to use libecal
-#
-#  LIBEDATABOOK_INCLUDE_DIRS         Location of libedata-book headers 
-#  LIBEDATABOOK_LIBRARIES           List of libraries to use libedata-book
-#  LIBEDATABOOK_LIBRARY_DIRS           Pathes of libraries to use libedata-book
-#  LIBEDATABOOK_LDFLAGS           List of link flags to use libedata-book
-#
-#  LIBEDATACAL_INCLUDE_DIRS         Location of libedata-cal headers 
-#  LIBEDATACAL_LIBRARIES           List of libraries to use libedata-cal
-#  LIBEDATACAL_LIBRARY_DIRS           Pathes of libraries to use libedata-cal
-#  LIBEDATACAL_LDFLAGS           List of link flags to use libedata-cal
-#
-#  LIBEDATASERVER_INCLUDE_DIRS         Location of libedataserver headers 
-#  LIBEDATASERVER_LIBRARIES           List of libraries to use libedataserver
-#  LIBEDATASERVER_LIBRARY_DIRS           Pathes of libraries to use libedataserver
-#  LIBEDATASERVER_LDFLAGS           List of link flags to use libedataserver
-#
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-FIND_PACKAGE ( EvolutionDataServer1.2 )
-FIND_PACKAGE ( EBook1.2 )
-FIND_PACKAGE ( ECal1.2 )
-FIND_PACKAGE ( EDataBook1.2 )
-FIND_PACKAGE ( EDataCal1.2 )
-FIND_PACKAGE ( EDataServer1.2 )
-IF ( EVOLUTIONDATASERVER1.2_LIBRARIES AND EVOLUTIONDATASERVER1.2_INCLUDE_DIRS )       
-       IF ( LIBEBOOK1.2_LIBRARIES AND LIBEBOOK1.2_INCLUDE_DIRS )       
-               IF ( LIBECAL1.2_LIBRARIES AND LIBECAL1.2_INCLUDE_DIRS ) 
-                       IF ( LIBEDATABOOK1.2_LIBRARIES AND LIBEDATABOOK1.2_INCLUDE_DIRS )       
-                               IF ( LIBEDATACAL1.2_LIBRARIES AND LIBEDATACAL1.2_INCLUDE_DIRS ) 
-                                       IF ( LIBEDATASERVER1.2_LIBRARIES AND LIBEDATASERVER1.2_INCLUDE_DIRS )   
-                                               SET( EDS1.2_FOUND 1 )
-                                       ELSE ( LIBEDATASERVER1.2_LIBRARIES AND LIBEDATASERVER1.2_INCLUDE_DIRS ) 
-                                               SET( EDS1.2_FOUND 0 )
-                                       ENDIF ( LIBEDATASERVER1.2_LIBRARIES AND LIBEDATASERVER1.2_INCLUDE_DIRS )        
-                               ELSE ( LIBEDATACAL1.2_LIBRARIES AND LIBEDATACAL1.2_INCLUDE_DIRS )       
-                                       SET( EDS1.2_FOUND 0 )
-                               ENDIF ( LIBEDATACAL1.2_LIBRARIES AND LIBEDATACAL1.2_INCLUDE_DIRS )      
-                       ELSE ( LIBEDATABOOK1.2_LIBRARIES AND LIBEDATABOOK1.2_INCLUDE_DIRS )     
-                               SET( EDS1.2_FOUND 0 )
-                       ENDIF ( LIBEDATABOOK1.2_LIBRARIES AND LIBEDATABOOK1.2_INCLUDE_DIRS )    
-               ELSE ( LIBECAL1.2_LIBRARIES AND LIBECAL1.2_INCLUDE_DIRS )       
-                       SET( EDS1.2_FOUND 0 )
-               ENDIF ( LIBECAL1.2_LIBRARIES AND LIBECAL1.2_INCLUDE_DIRS )      
-       ELSE ( LIBEBOOK1.2_LIBRARIES AND LIBEBOOK1.2_INCLUDE_DIRS )     
-               SET( EDS1.2_FOUND 0 )
-       ENDIF ( LIBEBOOK1.2_LIBRARIES AND LIBEBOOK1.2_INCLUDE_DIRS )    
-ELSE ( EVOLUTIONDATASERVER1.2_LIBRARIES AND EVOLUTIONDATASERVER1.2_INCLUDE_DIRS )     
-        SET( EDS1.2_FOUND 0 )
-ENDIF ( EVOLUTIONDATASERVER1.2_LIBRARIES AND EVOLUTIONDATASERVER1.2_INCLUDE_DIRS )    
-
-
-IF ( NOT EDS1.2_FOUND )
-       FIND_PACKAGE ( EvolutionDataServer1.0 )
-       FIND_PACKAGE ( EBook1.0 )
-       FIND_PACKAGE ( ECal1.0 )
-       FIND_PACKAGE ( EDataBook1.0 )
-       FIND_PACKAGE ( EDataCal1.0 )
-       FIND_PACKAGE ( EDataServer1.0 )
-       IF ( EVOLUTIONDATASERVER1.0_LIBRARIES AND EVOLUTIONDATASERVER1.0_INCLUDE_DIRS )       
-               IF ( LIBEBOOK1.0_LIBRARIES AND LIBEBOOK1.0_INCLUDE_DIRS )       
-                       IF ( LIBECAL1.0_LIBRARIES AND LIBECAL1.0_INCLUDE_DIRS ) 
-                               IF ( LIBEDATABOOK1.0_LIBRARIES AND LIBEDATABOOK1.0_INCLUDE_DIRS )       
-                                       IF ( LIBEDATACAL1.0_LIBRARIES AND LIBEDATACAL1.0_INCLUDE_DIRS ) 
-                                               IF ( LIBEDATASERVER1.0_LIBRARIES AND LIBEDATASERVER1.0_INCLUDE_DIRS )   
-                                                       SET( EDS1.0_FOUND 1 )
-                                               ELSE ( LIBEDATASERVER1.0_LIBRARIES AND LIBEDATASERVER1.0_INCLUDE_DIRS ) 
-                                                       SET( EDS1.0_FOUND 0 )
-                                               ENDIF ( LIBEDATASERVER1.0_LIBRARIES AND LIBEDATASERVER1.0_INCLUDE_DIRS )        
-                                       ELSE ( LIBEDATACAL1.0_LIBRARIES AND LIBEDATACAL1.0_INCLUDE_DIRS )       
-                                               SET( EDS1.0_FOUND 0 )
-                                       ENDIF ( LIBEDATACAL1.0_LIBRARIES AND LIBEDATACAL1.0_INCLUDE_DIRS )      
-                               ELSE ( LIBEDATABOOK1.0_LIBRARIES AND LIBEDATABOOK1.0_INCLUDE_DIRS )     
-                                       SET( EDS1.0_FOUND 0 )
-                               ENDIF ( LIBEDATABOOK1.0_LIBRARIES AND LIBEDATABOOK1.0_INCLUDE_DIRS )    
-                       ELSE ( LIBECAL1.0_LIBRARIES AND LIBECAL1.0_INCLUDE_DIRS )       
-                               SET( EDS1.0_FOUND 0 )
-                       ENDIF ( LIBECAL1.0_LIBRARIES AND LIBECAL1.0_INCLUDE_DIRS )      
-               ELSE ( LIBEBOOK1.0_LIBRARIES AND LIBEBOOK1.0_INCLUDE_DIRS )     
-                       SET( EDS1.0_FOUND 0 )
-               ENDIF ( LIBEBOOK1.0_LIBRARIES AND LIBEBOOK1.0_INCLUDE_DIRS )    
-       ELSE ( EVOLUTIONDATASERVER1.0_LIBRARIES AND EVOLUTIONDATASERVER1.0_INCLUDE_DIRS )     
-               SET( EDS1.0_FOUND 0 )
-       ENDIF ( EVOLUTIONDATASERVER1.0_LIBRARIES AND EVOLUTIONDATASERVER1.0_INCLUDE_DIRS )    
-ENDIF ( NOT EDS1.2_FOUND )
-
-
-
-
-IF ( EDS1.2_FOUND )
-  MESSAGE( STATUS "Evolution Data Server 1.2 used." )
-  SET( EVOLUTIONDATASERVER_INCLUDE_DIRS ${EVOLUTIONDATASERVER1.2_INCLUDE_DIRS} )
-  SET( EVOLUTIONDATASERVER_LIBRARIES ${EVOLUTIONDATASERVER1.2_LIBRARIES} )
-  SET( EVOLUTIONDATASERVER_LIBRARY_DIRS ${EVOLUTIONDATASERVER1.2_LIBRARY_DIRS} )
-  SET( EVOLUTIONDATASERVER_LDFLAGS ${EVOLUTIONDATASERVER1.2_LDFLAGS} )
-  SET( LIBEBOOK_INCLUDE_DIRS ${LIBEBOOK1.2_INCLUDE_DIRS} )
-  SET( LIBEBOOK_LIBRARIES ${LIBEBOOK1.2_LIBRARIES} )
-  SET( LIBEBOOK_LIBRARY_DIRS ${LIBEBOOK1.2_LIBRARY_DIRS} )
-  SET( LIBEBOOK_LDFLAGS ${LIBEBOOK1.2_LDFLAGS} )
-  SET( LIBECAL_INCLUDE_DIRS ${LIBECAL1.2_INCLUDE_DIRS} )
-  SET( LIBECAL_LIBRARIES ${LIBECAL1.2_LIBRARIES} )
-  SET( LIBECAL_LIBRARY_DIRS ${LIBECAL1.2_LIBRARY_DIRS} )
-  SET( LIBECAL_LDFLAGS ${LIBECAL1.2_LDFLAGS} )
-  SET( LIBEDATABOOK_INCLUDE_DIRS ${LIBEDATABOOK1.2_INCLUDE_DIRS} )
-  SET( LIBEDATABOOK_LIBRARIES ${LIBEDATABOOK1.2_LIBRARIES} )
-  SET( LIBEDATABOOK_LIBRARY_DIRS ${LIBEDATABOOK1.2_LIBRARY_DIRS} )
-  SET( LIBEDATABOOK_LDFLAGS ${LIBEDATABOOK1.2_LDFLAGS} )
-  SET( LIBEDATACAL_INCLUDE_DIRS ${LIBEDATACAL1.2_INCLUDE_DIRS} )
-  SET( LIBEDATACAL_LIBRARIES ${LIBEDATACAL1.2_LIBRARIES} )
-  SET( LIBEDATACAL_LIBRARY_DIRS ${LIBEDATACAL1.2_LIBRARY_DIRS} )
-  SET( LIBEDATACAL_LDFLAGS ${LIBEDATACAL1.2_LDFLAGS} )
-  SET( LIBEDATASERVER_INCLUDE_DIRS ${LIBEDATASERVER1.2_INCLUDE_DIRS} )
-  SET( LIBEDATASERVER_LIBRARIES ${LIBEDATASERVER1.2_LIBRARIES} )
-  SET( LIBEDATASERVER_LIBRARY_DIRS ${LIBEDATASERVER1.2_LIBRARY_DIRS} )
-  SET( LIBEDATASERVER_LDFLAGS ${LIBEDATASERVER1.2_LDFLAGS} )
-ELSE ( EDS1.2_FOUND )
-  IF ( EDS1.0_FOUND )
-    MESSAGE( STATUS "Evolution Data Server 1.0 used." )
-    SET( EVOLUTIONDATASERVER_INCLUDE_DIRS ${EVOLUTIONDATASERVER1.0_INCLUDE_DIRS} )
-    SET( EVOLUTIONDATASERVER_LIBRARIES ${EVOLUTIONDATASERVER1.2_LIBRARIES} )
-    SET( EVOLUTIONDATASERVER_LIBRARY_DIRS ${EVOLUTIONDATASERVER1.2_LIBRARY_DIRS} )
-    SET( EVOLUTIONDATASERVER_LDFLAGS ${EVOLUTIONDATASERVER1.2_LDFLAGS} )
-    SET( LIBEBOOK_INCLUDE_DIRS ${LIBEBOOK1.0_INCLUDE_DIRS} )
-    SET( LIBEBOOK_LIBRARIES ${LIBEBOOK1.0_LIBRARIES} )
-    SET( LIBEBOOK_LIBRARY_DIRS ${LIBEBOOK1.0_LIBRARY_DIRS} )
-    SET( LIBEBOOK_LDFLAGS ${LIBEBOOK1.0_LDFLAGS} )
-    SET( LIBECAL_INCLUDE_DIRS ${LIBECAL1.0_INCLUDE_DIRS} )
-    SET( LIBECAL_LIBRARIES ${LIBECAL1.0_LIBRARIES} )
-    SET( LIBECAL_LIBRARY_DIRS ${LIBECAL1.0_LIBRARY_DIRS} )
-    SET( LIBECAL_LDFLAGS ${LIBECAL1.0_LDFLAGS} )
-    SET( LIBEDATABOOK_INCLUDE_DIRS ${LIBEDATABOOK1.0_INCLUDE_DIRS} )
-    SET( LIBEDATABOOK_LIBRARIES ${LIBEDATABOOK1.0_LIBRARIES} )
-    SET( LIBEDATABOOK_LIBRARY_DIRS ${LIBEDATABOOK1.0_LIBRARY_DIRS} )
-    SET( LIBEDATABOOK_LDFLAGS ${LIBEDATABOOK1.0_LDFLAGS} )
-    SET( LIBEDATACAL_INCLUDE_DIRS ${LIBEDATACAL1.0_INCLUDE_DIRS} )
-    SET( LIBEDATACAL_LIBRARIES ${LIBEDATACAL1.0_LIBRARIES} )
-    SET( LIBEDATACAL_LIBRARY_DIRS ${LIBEDATACAL1.0_LIBRARY_DIRS} )
-    SET( LIBEDATACAL_LDFLAGS ${LIBEDATACAL1.0_LDFLAGS} )
-    SET( LIBEDATASERVER_INCLUDE_DIRS ${LIBEDATASERVER1.0_INCLUDE_DIRS} )
-    SET( LIBEDATASERVER_LIBRARIES ${LIBEDATASERVER1.0_LIBRARIES} )
-    SET( LIBEDATASERVER_LIBRARY_DIRS ${LIBEDATASERVER1.0_LIBRARY_DIRS} )
-    SET( LIBEDATASERVER_LDFLAGS ${LIBEDATASERVER1.0_LDFLAGS} )
-  ELSE ( EDS1.0_FOUND )
-    MESSAGE( FATAL_ERROR "Evolution Data Server not found." )
-  ENDIF ( EDS1.0_FOUND )
-ENDIF ( EDS1.2_FOUND )
-
diff --git a/cmake/modules/FindEvolutionDataServer1.0.cmake b/cmake/modules/FindEvolutionDataServer1.0.cmake
deleted file mode 100644 (file)
index 42fa3c7..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-# - Try to find evolutiondataserver1.0 components
-# Find evolutiondataserver 1.0 headers, libraries and the answer to all questions.
-#
-#  EVOLUTIONDATASERVER1.0_FOUND               True if evolutiondataserver1.0 got found
-#  EVOLUTIONDATASERVER1.0_INCLUDE_DIRS         Location of evolutiondataserver1.0 headers 
-#  EVOLUTIONDATASERVER1.0_LIBRARIES           List of libaries to use evolutiondataserver1.0
-#  EVOLUTIONDATASERVER1.0_DEFINITIONS         Definitions to compile evolutiondataserver1.0 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about evolution-data-server-1.0.pc settings
-IF ( EvolutionDataServer1.0_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( EvolutionDataServer1.0_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( EvolutionDataServer1.0_FIND_REQUIRED )
-
-pkg_search_module( EVOLUTIONDATASERVER1.0 ${_pkgconfig_REQUIRED} evolution-data-server-1.0 )
-
-
-# Look for evolutiondataserver1.0 include dir and libraries w/o pkg-config.
-IF ( NOT EVOLUTIONDATASERVER1.0_FOUND AND NOT PKG_CONFIG_FOUND )
-        # Handle dependencies
-       IF ( NOT LIBGNOME2_FOUND )
-               FIND_PACKAGE ( LibGnome2 REQUIRED )
-                IF ( LIBGNOME2_FOUND )
-                        SET ( EVOLUTIONDATASERVER1.0_INCLUDE_DIRS ${EVOLUTIONDATASERVER1.0_INCLUDE_DIRS} ${LIBGNOME2_INCLUDE_DIRS} )
-                        SET ( EVOLUTIONDATASERVER1.0_LIBRARIES ${EVOLUTIONDATASERVER1.0_LIBRARIES} ${LIBGNOME2_LIBRARIES} )
-                ENDIF ( LIBGNOME2_FOUND )              
-       ENDIF ( NOT LIBGNOME2_FOUND )
-       IF ( NOT BONOBO2_FOUND )
-               SET ( BONOBO2_MIN_VERSION "2.4.2" )
-               FIND_PACKAGE ( BONOBO2 REQUIRED )
-                IF ( BONOBO2_FOUND )
-                        SET ( EVOLUTIONDATASERVER1.0_INCLUDE_DIRS ${EVOLUTIONDATASERVER1.0_INCLUDE_DIRS} ${BONOBO2_INCLUDE_DIRS} )
-                        SET ( EVOLUTIONDATASERVER1.0_LIBRARIES ${EVOLUTIONDATASERVER1.0_LIBRARIES} ${BONOBO2_LIBRARIES} )
-                ENDIF ( BONOBO2_FOUND )                
-       ENDIF ( NOT BONOBO2_FOUND )
-
-       # Report results
-       IF ( EVOLUTIONDATASERVER1.0_LIBRARIES AND EVOLUTIONDATASERVER1.0_INCLUDE_DIRS )
-               SET( EVOLUTIONDATASERVER1.0_FOUND 1 )
-               IF ( NOT EvolutionDataServer1.0_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found evolutiondataserver-1.0: ${EVOLUTIONDATASERVER1.0_LIBRARIES}" )
-               ENDIF ( NOT EvolutionDataServer1.0_FIND_QUIETLY )
-       ELSE ( EVOLUTIONDATASERVER1.0_LIBRARIES AND EVOLUTIONDATASERVER1.0_INCLUDE_DIRS )       
-               IF ( EvolutionDataServer1.0_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find evolutiondataserver-1.0" )
-               ELSE ( EvolutionDataServer1.0_FIND_REQUIRED )
-                       IF ( NOT EvolutionDataServer1.0_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find evolutiondataserver-1.0" )      
-                       ENDIF ( NOT EvolutionDataServer1.0_FIND_QUIETLY )
-               ENDIF ( EvolutionDataServer1.0_FIND_REQUIRED )
-       ENDIF ( EVOLUTIONDATASERVER1.0_LIBRARIES AND EVOLUTIONDATASERVER1.0_INCLUDE_DIRS )      
-
-ENDIF ( NOT EVOLUTIONDATASERVER1.0_FOUND AND NOT PKG_CONFIG_FOUND )
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( EVOLUTIONDATASERVER1.0_LIBRARIES EVOLUTIONDATASERVER1.0_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindEvolutionDataServer1.2.cmake b/cmake/modules/FindEvolutionDataServer1.2.cmake
deleted file mode 100644 (file)
index ab7f476..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-# - Try to find evolutiondataserver1.2 components
-# Find evolutiondataserver 1.2 headers, libraries and the answer to all questions.
-#
-#  EVOLUTIONDATASERVER1.2_FOUND               True if evolutiondataserver1.2 got found
-#  EVOLUTIONDATASERVER1.2_INCLUDE_DIRS         Location of evolutiondataserver1.2 headers 
-#  EVOLUTIONDATASERVER1.2_LIBRARIES           List of libaries to use evolutiondataserver1.2
-#  EVOLUTIONDATASERVER1.2_DEFINITIONS         Definitions to compile evolutiondataserver1.2 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about evolution-data-server-1.2.pc settings
-IF ( EvolutionDataServer1.2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( EvolutionDataServer1.2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( EvolutionDataServer1.2_FIND_REQUIRED )
-
-pkg_search_module( EVOLUTIONDATASERVER1.2 ${_pkgconfig_REQUIRED} evolution-data-server-1.2 )
-
-
-# Look for evolutiondataserver1.2 include dir and libraries w/o pkg-config.
-IF ( NOT EVOLUTIONDATASERVER1.2_FOUND AND NOT PKG_CONFIG_FOUND )
-        # Handle dependencies
-       IF ( NOT LIBGNOME2_FOUND )
-               FIND_PACKAGE ( LibGnome2 REQUIRED )
-                IF ( LIBGNOME2_FOUND )
-                        SET ( EVOLUTIONDATASERVER1.2_INCLUDE_DIRS ${EVOLUTIONDATASERVER1.2_INCLUDE_DIRS} ${LIBGNOME2_INCLUDE_DIRS} )
-                        SET ( EVOLUTIONDATASERVER1.2_LIBRARIES ${EVOLUTIONDATASERVER1.2_LIBRARIES} ${LIBGNOME2_LIBRARIES} )
-                ENDIF ( LIBGNOME2_FOUND )              
-       ENDIF ( NOT LIBGNOME2_FOUND )
-       IF ( NOT BONOBO2_FOUND )
-               SET ( BONOBO2_MIN_VERSION "2.4.2" )
-               FIND_PACKAGE ( BONOBO2 REQUIRED )
-                IF ( BONOBO2_FOUND )
-                        SET ( EVOLUTIONDATASERVER1.2_INCLUDE_DIRS ${EVOLUTIONDATASERVER1.2_INCLUDE_DIRS} ${BONOBO2_INCLUDE_DIRS} )
-                        SET ( EVOLUTIONDATASERVER1.2_LIBRARIES ${EVOLUTIONDATASERVER1.2_LIBRARIES} ${BONOBO2_LIBRARIES} )
-                ENDIF ( BONOBO2_FOUND )                
-       ENDIF ( NOT BONOBO2_FOUND )
-
-       # Report results
-       IF ( EVOLUTIONDATASERVER1.2_LIBRARIES AND EVOLUTIONDATASERVER1.2_INCLUDE_DIRS )
-               SET( EVOLUTIONDATASERVER1.2_FOUND 1 )
-               IF ( NOT EvolutionDataServer1.2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found evolutiondataserver-1.2: ${EVOLUTIONDATASERVER1.2_LIBRARIES}" )
-               ENDIF ( NOT EvolutionDataServer1.2_FIND_QUIETLY )
-       ELSE ( EVOLUTIONDATASERVER1.2_LIBRARIES AND EVOLUTIONDATASERVER1.2_INCLUDE_DIRS )       
-               IF ( EvolutionDataServer1.2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find evolutiondataserver-1.2" )
-               ELSE ( EvolutionDataServer1.2_FIND_REQUIRED )
-                       IF ( NOT EvolutionDataServer1.2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find evolutiondataserver-1.2" )      
-                       ENDIF ( NOT EvolutionDataServer1.2_FIND_QUIETLY )
-               ENDIF ( EvolutionDataServer1.2_FIND_REQUIRED )
-       ENDIF ( EVOLUTIONDATASERVER1.2_LIBRARIES AND EVOLUTIONDATASERVER1.2_INCLUDE_DIRS )      
-
-ENDIF ( NOT EVOLUTIONDATASERVER1.2_FOUND AND NOT PKG_CONFIG_FOUND )
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( EVOLUTIONDATASERVER1.2_LIBRARIES EVOLUTIONDATASERVER1.2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindExpat.cmake b/cmake/modules/FindExpat.cmake
deleted file mode 100644 (file)
index 974ddfd..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-# - Try to find Expat 
-# Find Expat headers, libraries and the answer to all questions.
-#
-#  EXPAT_FOUND               True if Expat got found
-#  EXPAT_INCLUDE_DIRS        Location of Expat headers 
-#  EXPAT_LIBRARIES           List of libraries to use Expat 
-#
-#  Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-# WARNING: Currently Expat doesn't provide a .pc file
-#          Therefore it is not possible to use FindPkgConfig and to require a min version
-
-#INCLUDE( FindPkgConfig )
-
-#IF ( EXPAT_FIND_REQUIRED )
-#      SET( _pkgconfig_REQUIRED "REQUIRED" )
-#ELSE( EXPAT_FIND_REQUIRED )
-#      SET( _pkgconfig_REQUIRED "" )   
-#ENDIF ( EXPAT_FIND_REQUIRED )
-
-#IF ( EXPAT_MIN_VERSION )
-#      PKG_SEARCH_MODULE( EXPAT ${_pkgconfig_REQUIRED} expat>=${EXPAT_MIN_VERSION} )
-#ELSE ( EXPAT_MIN_VERSION )
-#      PKG_SEARCH_MODULE( EXPAT ${_pkgconfig_REQUIRED} expat )
-#ENDIF ( EXPAT_MIN_VERSION )
-
-
-#IF( NOT EXPAT_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( EXPAT_INCLUDE_DIRS expat.h)
-       FIND_LIBRARY( EXPAT_LIBRARIES expat )
-
-       # Report results
-       IF ( EXPAT_LIBRARIES AND EXPAT_INCLUDE_DIRS )   
-               SET( EXPAT_FOUND 1 )
-               IF ( NOT EXPAT_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found Expat: ${EXPAT_LIBRARIES}" )
-               ENDIF ( NOT EXPAT_FIND_QUIETLY )
-       ELSE ( EXPAT_LIBRARIES AND EXPAT_INCLUDE_DIRS ) 
-               IF ( EXPAT_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find Expat" )
-               ELSE ( EXPAT_FIND_REQUIRED )
-                       IF ( NOT EXPAT_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find Expat" )        
-                       ENDIF ( NOT EXPAT_FIND_QUIETLY )
-               ENDIF ( EXPAT_FIND_REQUIRED )
-       ENDIF ( EXPAT_LIBRARIES AND EXPAT_INCLUDE_DIRS )
-#ENDIF( NOT EXPAT_FOUND AND NOT PKG_CONFIG_FOUND )
-
-MARK_AS_ADVANCED( EXPAT_LIBRARIES EXPAT_INCLUDE_DIRS )
\ No newline at end of file
diff --git a/cmake/modules/FindGConf2.cmake b/cmake/modules/FindGConf2.cmake
deleted file mode 100644 (file)
index 867601b..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-# - Try to find gconf2 
-# Find gconf2 headers, libraries and the answer to all questions.
-#
-#  GCONF2_FOUND               True if gconf2 got found
-#  GCONF2_INCLUDEDIR          Location of gconf2 headers 
-#  GCONF2_LIBRARIES           List of libaries to use gconf2
-#  GCONF2_DEFINITIONS         Definitions to compile gconf2 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about gconf-2.0.pc settings
-IF ( GConf2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( GConf2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( GConf2_FIND_REQUIRED )
-
-pkg_search_module( GCONF2 ${_pkgconfig_REQUIRED} gconf-2.0 )
-
-
-# Look for gconf2 include dir and libraries w/o pkgconfig
-IF ( NOT GCONF2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _gconf2_include_DIR gconf/gconf.h PATH_SUFFIXES gconf/2 
-               PATHS
-               /opt/local/include/
-               /sw/include/
-               /usr/local/include/
-               /usr/include/
-       )
-       FIND_LIBRARY( _gconf2_link_DIR gconf-2
-               PATHS
-               /opt/local/lib
-               /sw/lib
-               /usr/lib
-               /usr/local/lib
-               /usr/lib64
-               /usr/local/lib64
-               /opt/lib64
-       )
-       IF ( _gconf2_include_DIR AND _gconf2_link_DIR )
-               SET ( _gconf2_FOUND TRUE )
-       ENDIF ( _gconf2_include_DIR AND _gconf2_link_DIR )
-
-
-       IF ( _gconf2_FOUND )
-               SET ( GCONF2_INCLUDE_DIRS ${_gconf2_include_DIR} )
-               SET ( GCONF2_LIBRARIES ${_gconf2_link_DIR} )
-       ENDIF ( _gconf2_FOUND )
-
-       # Handle dependencies
-       IF ( NOT ORBIT2_FOUND )
-               FIND_PACKAGE( ORBit2 REQUIRED)
-               IF ( ORBIT2_FOUND )
-                       SET ( GCONF2_INCLUDE_DIRS ${GCONF2_INCLUDE_DIRS} ${ORBIT2_INCLUDE_DIRS} )
-                       SET ( GCONF2_LIBRARIES ${GCONF2_LIBRARIES} ${ORBIT2_LIBRARIES} )
-               ENDIF ( ORBIT2_FOUND )
-       ENDIF ( NOT ORBIT2_FOUND )
-
-       # Report results
-       IF ( GCONF2_LIBRARIES AND GCONF2_INCLUDE_DIRS AND _gconf2_FOUND )       
-               SET( GCONF2_FOUND 1 )
-               IF ( NOT GConf2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found gconf2: ${GCONF2_LIBRARIES} ${GCONF2_INCLUDE_DIRS}" )
-               ENDIF ( NOT GConf2_FIND_QUIETLY )
-       ELSE ( GCONF2_LIBRARIES AND GCONF2_INCLUDE_DIRS AND _gconf2_FOUND )     
-               IF ( GConf2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find gconf2" )
-               ELSE ( GConf2_FIND_REQUIRED )
-                       IF ( NOT GConf2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find gconf2" )       
-                       ENDIF ( NOT GConf2_FIND_QUIETLY )
-               ENDIF ( GConf2_FIND_REQUIRED )
-       ENDIF ( GCONF2_LIBRARIES AND GCONF2_INCLUDE_DIRS AND _gconf2_FOUND )    
-
-ENDIF ( NOT GCONF2_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( GCONF2_LIBRARIES GCONF2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake
deleted file mode 100644 (file)
index 87bf6ec..0000000
+++ /dev/null
@@ -1,235 +0,0 @@
-# - Try to find GLib2
-# Once done this will define
-#
-#  GLIB2_FOUND - system has GLib2
-#  GLIB2_INCLUDE_DIRS - the GLib2 include directory
-#  GLIB2_LIBRARIES - Link these to use GLib2
-#
-#  HAVE_GLIB_GREGEX_H  glib has gregex.h header and 
-#                      supports g_regex_match_simple
-#
-#  Copyright (c) 2006 Andreas Schneider <mail@cynapses.org>
-#  Copyright (c) 2006 Philippe Bernery <philippe.bernery@gmail.com>
-#  Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-#  Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#  Copyright (c) 2008 Michael Bell <michael.bell@web.de>
-#  Copyright (c) 2008-2009 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-IF (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS )
-  # in cache already
-  SET(GLIB2_FOUND TRUE)
-ELSE (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS )
-
-  INCLUDE(FindPkgConfig)
-
-  ## Glib
-  IF ( GLIB2_FIND_REQUIRED )
-    SET( _pkgconfig_REQUIRED "REQUIRED" )
-  ELSE ( GLIB2_FIND_REQUIRED )
-    SET( _pkgconfig_REQUIRED "" )
-  ENDIF ( GLIB2_FIND_REQUIRED )
-
-  IF ( GLIB2_MIN_VERSION )
-    PKG_SEARCH_MODULE( GLIB2 ${_pkgconfig_REQUIRED} glib-2.0>=${GLIB2_MIN_VERSION} )
-  ELSE ( GLIB2_MIN_VERSION )
-    PKG_SEARCH_MODULE( GLIB2 ${_pkgconfig_REQUIRED} glib-2.0 )
-  ENDIF ( GLIB2_MIN_VERSION )
-  IF ( PKG_CONFIG_FOUND )
-    IF ( GLIB2_FOUND )
-      SET ( GLIB2_CORE_FOUND TRUE )
-    ELSE ( GLIB2_FOUND )
-      SET ( GLIB2_CORE_FOUND FALSE )
-    ENDIF ( GLIB2_FOUND )
-  ENDIF ( PKG_CONFIG_FOUND )
-
-  # Look for glib2 include dir and libraries w/o pkgconfig
-  IF ( NOT GLIB2_FOUND AND NOT PKG_CONFIG_FOUND )
-    FIND_PATH(
-      _glibconfig_include_DIR
-    NAMES
-      glibconfig.h
-    PATHS
-      /opt/gnome/lib64
-      /opt/gnome/lib
-      /opt/lib/
-      /opt/local/lib
-      /sw/lib/
-      /usr/lib64
-      /usr/lib
-      /usr/local/include
-      ${CMAKE_LIBRARY_PATH}
-    PATH_SUFFIXES
-      glib-2.0/include
-    )
-
-    FIND_PATH(
-      _glib2_include_DIR
-    NAMES
-      glib.h
-    PATHS
-      /opt/gnome/include
-      /opt/local/include
-      /sw/include
-      /usr/include
-      /usr/local/include
-    PATH_SUFFIXES
-      glib-2.0
-    )
-
-    #MESSAGE(STATUS "Glib headers: ${_glib2_include_DIR}")
-
-    FIND_LIBRARY(
-      _glib2_link_DIR
-    NAMES
-      glib-2.0
-      glib
-    PATHS
-      /opt/gnome/lib
-      /opt/local/lib
-      /sw/lib
-      /usr/lib
-      /usr/local/lib
-    )
-    IF ( _glib2_include_DIR AND _glib2_link_DIR )
-        SET ( _glib2_FOUND TRUE )
-    ENDIF ( _glib2_include_DIR AND _glib2_link_DIR )
-
-
-    IF ( _glib2_FOUND )
-        SET ( GLIB2_INCLUDE_DIRS ${_glib2_include_DIR} ${_glibconfig_include_DIR} )
-        SET ( GLIB2_LIBRARIES ${_glib2_link_DIR} )
-        SET ( GLIB2_CORE_FOUND TRUE )
-    ELSE ( _glib2_FOUND )
-        SET ( GLIB2_CORE_FOUND FALSE )
-    ENDIF ( _glib2_FOUND )
-
-    # Handle dependencies
-    # libintl
-    IF ( NOT LIBINTL_FOUND )
-      FIND_PATH(LIBINTL_INCLUDE_DIR
-      NAMES
-        libintl.h
-      PATHS
-        /opt/gnome/include
-        /opt/local/include
-        /sw/include
-        /usr/include
-        /usr/local/include
-      )
-
-      FIND_LIBRARY(LIBINTL_LIBRARY
-      NAMES
-        intl
-      PATHS
-        /opt/gnome/lib
-        /opt/local/lib
-        /sw/lib
-        /usr/local/lib
-        /usr/lib
-      )
-
-      IF (LIBINTL_LIBRARY AND LIBINTL_INCLUDE_DIR)
-        SET (LIBINTL_FOUND TRUE)
-      ENDIF (LIBINTL_LIBRARY AND LIBINTL_INCLUDE_DIR)
-    ENDIF ( NOT LIBINTL_FOUND )
-
-    # libiconv
-    IF ( NOT LIBICONV_FOUND )
-      FIND_PATH(LIBICONV_INCLUDE_DIR
-      NAMES
-        iconv.h
-      PATHS
-        /opt/gnome/include
-        /opt/local/include
-        /opt/local/include
-        /sw/include
-        /sw/include
-        /usr/local/include
-        /usr/include
-      PATH_SUFFIXES
-        glib-2.0
-      )
-
-      FIND_LIBRARY(LIBICONV_LIBRARY
-      NAMES
-        iconv
-      PATHS
-        /opt/gnome/lib
-        /opt/local/lib
-        /sw/lib
-        /usr/lib
-        /usr/local/lib
-      )
-
-      IF (LIBICONV_LIBRARY AND LIBICONV_INCLUDE_DIR)
-        SET (LIBICONV_FOUND TRUE)
-      ENDIF (LIBICONV_LIBRARY AND LIBICONV_INCLUDE_DIR)
-    ENDIF ( NOT LIBICONV_FOUND )
-
-    IF (LIBINTL_FOUND)
-      SET (GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ${LIBINTL_LIBRARY})
-      SET (GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS} ${LIBINTL_INCLUDE_DIR})
-    ENDIF (LIBINTL_FOUND)
-
-    IF (LIBICONV_FOUND)
-      SET (GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ${LIBICONV_LIBRARY})
-      SET (GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS} ${LIBICONV_INCLUDE_DIR})
-    ENDIF (LIBICONV_FOUND)
-
-  ENDIF ( NOT GLIB2_FOUND AND NOT PKG_CONFIG_FOUND )
-  ##
-
-  IF (GLIB2_CORE_FOUND AND GLIB2_INCLUDE_DIRS AND GLIB2_LIBRARIES)
-    SET (GLIB2_FOUND TRUE)
-  ENDIF (GLIB2_CORE_FOUND AND GLIB2_INCLUDE_DIRS AND GLIB2_LIBRARIES)
-
-  IF (GLIB2_FOUND)
-    IF (NOT GLIB2_FIND_QUIETLY)
-      MESSAGE (STATUS "Found GLib2: ${GLIB2_LIBRARIES} ${GLIB2_INCLUDE_DIRS}")
-    ENDIF (NOT GLIB2_FIND_QUIETLY)
-  ELSE (GLIB2_FOUND)
-    IF (GLIB2_FIND_REQUIRED)
-      MESSAGE (SEND_ERROR "Could not find GLib2")
-    ENDIF (GLIB2_FIND_REQUIRED)
-  ENDIF (GLIB2_FOUND)
-
-  # show the GLIB2_INCLUDE_DIRS and GLIB2_LIBRARIES variables only in the advanced view
-  MARK_AS_ADVANCED(GLIB2_INCLUDE_DIRS GLIB2_LIBRARIES)
-  MARK_AS_ADVANCED(LIBICONV_INCLUDE_DIR LIBICONV_LIBRARY)
-  MARK_AS_ADVANCED(LIBINTL_INCLUDE_DIR LIBINTL_LIBRARY)
-
-ENDIF (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS)
-
-IF ( WIN32 )
-    # include libiconv for win32
-    IF ( NOT LIBICONV_FOUND )
-      FIND_PATH(LIBICONV_INCLUDE_DIR iconv.h PATH_SUFFIXES glib-2.0)
-
-      FIND_LIBRARY(LIBICONV_LIBRARY NAMES iconv)
-
-      IF (LIBICONV_LIBRARY AND LIBICONV_INCLUDE_DIR)
-        SET (LIBICONV_FOUND TRUE)
-      ENDIF (LIBICONV_LIBRARY AND LIBICONV_INCLUDE_DIR)
-    ENDIF ( NOT LIBICONV_FOUND )
-    IF (LIBICONV_FOUND)
-      SET (GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ${LIBICONV_LIBRARY})
-      SET (GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS} ${LIBICONV_INCLUDE_DIR})
-    ENDIF (LIBICONV_FOUND)
-ENDIF ( WIN32 )
-
-IF ( GLIB2_FOUND )
-       # Check if system has a newer version of glib
-       # which supports g_regex_match_simple
-       INCLUDE( CheckIncludeFiles )
-       SET( CMAKE_REQUIRED_INCLUDES ${GLIB2_INCLUDE_DIRS} )
-       CHECK_INCLUDE_FILES ( glib/gregex.h HAVE_GLIB_GREGEX_H )
-       CHECK_INCLUDE_FILES ( glib/gchecksum.h HAVE_GLIB_GCHECKSUM_H )
-       # Reset CMAKE_REQUIRED_INCLUDES
-       SET( CMAKE_REQUIRED_INCLUDES "" )
-ENDIF( GLIB2_FOUND )
diff --git a/cmake/modules/FindGMODULE2.cmake b/cmake/modules/FindGMODULE2.cmake
deleted file mode 100644 (file)
index a367660..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-# - Try to find GModule2 
-# Find GModule headers, libraries and the answer to all questions.
-#
-#  GMODULE2_FOUND               True if GMODULE2 got found
-#  GMODULE2_INCLUDE_DIRS        Location of GMODULE2 headers 
-#  GMODULE2_LIBRARIES           List of libraries to use GMODULE2 
-#
-#  Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-IF ( GMODULE2_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( GMODULE2_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( GMODULE2_FIND_REQUIRED )
-
-IF ( GMODULE2_MIN_VERSION )
-       PKG_SEARCH_MODULE( GMODULE2 ${_pkgconfig_REQUIRED} gmodule-2.0>=${GMODULE2_MIN_VERSION} )
-ELSE ( GMODULE2_MIN_VERSION )
-       PKG_SEARCH_MODULE( GMODULE2 ${_pkgconfig_REQUIRED} gmodule-2.0 )
-ENDIF ( GMODULE2_MIN_VERSION )
-
-
-IF( NOT GMODULE2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( GMODULE2_INCLUDE_DIRS gmodule.h PATH_SUFFIXES glib-2.0 )
-
-       IF ( APPLE )
-               FIND_LIBRARY( GMODULE2_LIBRARIES glib )
-       ELSE ( APPLE )
-               FIND_LIBRARY( GMODULE2_LIBRARIES NAMES gmodule-2.0 gmodule )
-       ENDIF (APPLE)
-
-       # Report results
-       IF ( GMODULE2_LIBRARIES AND GMODULE2_INCLUDE_DIRS )     
-               SET( GMODULE2_FOUND 1 )
-               IF ( NOT GMODULE2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found GMODULE2: ${GMODULE2_LIBRARIES} ${GMODULE2_INCLUDE_DIRS}" )
-               ENDIF ( NOT GMODULE2_FIND_QUIETLY )
-       ELSE ( GMODULE2_LIBRARIES AND GMODULE2_INCLUDE_DIRS )   
-               IF ( GMODULE2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find GMODULE2" )
-               ELSE ( GMODULE2_FIND_REQUIRED )
-                       IF ( NOT GMODULE2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find GMODULE2" )     
-                       ENDIF ( NOT GMODULE2_FIND_QUIETLY )
-               ENDIF ( GMODULE2_FIND_REQUIRED )
-       ENDIF ( GMODULE2_LIBRARIES AND GMODULE2_INCLUDE_DIRS )
-ENDIF( NOT GMODULE2_FOUND AND NOT PKG_CONFIG_FOUND )
-
-MARK_AS_ADVANCED( GMODULE2_LIBRARIES GMODULE2_INCLUDE_DIRS )
\ No newline at end of file
diff --git a/cmake/modules/FindGNOKII.cmake b/cmake/modules/FindGNOKII.cmake
deleted file mode 100644 (file)
index 61f2e4b..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-# - Try to find GNOKII
-# Find GNOKII headers, libraries and the answer to all questions.
-#
-#  GNOKII_FOUND               True if GNOKII got found
-#  GNOKII_INCLUDE_DIRS        Location of GNOKII headers 
-#  GNOKII_LIBRARIES           List of libaries to use GNOKII
-#  GNOKII_DEFINITIONS         Definitions to compile GNOKII 
-#
-#  Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-#  Copyright (c) 2008 Bjoern Ricks  <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#      
-
-INCLUDE( FindPkgConfig )
-
-IF ( GNOKII_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( GNOKII_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( GNOKII_FIND_REQUIRED )
-
-IF ( GNOKII_MIN_VERSION )
-       PKG_SEARCH_MODULE( GNOKII ${_pkgconfig_REQUIRED} gnokii>=${GNOKII_MIN_VERSION} )
-ELSE ( GNOKII_MIN_VERSION )
-       PKG_SEARCH_MODULE( GNOKII ${_pkgconfig_REQUIRED} gnokii )
-ENDIF ( GNOKII_MIN_VERSION )
-
-
-IF( NOT GNOKII_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( GNOKII_INCLUDE_DIRS gnokii.h )
-       FIND_LIBRARY( GNOKII_LIBRARIES gnokii)
-
-       # Report results
-       IF ( GNOKII_LIBRARIES AND GNOKII_INCLUDE_DIRS ) 
-               SET( GNOKII_FOUND 1 )
-               IF ( NOT GNOKII_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found GNOKII: ${GNOKII_LIBRARIES}" )
-               ENDIF ( NOT GNOKII_FIND_QUIETLY )
-       ELSE ( GNOKII_LIBRARIES AND GNOKII_INCLUDE_DIRS )       
-               IF ( GNOKII_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find GNOKII" )
-               ELSE ( GNOKII_FIND_REQUIRED )
-                       IF ( NOT GNOKII_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find GNOKII" )       
-                       ENDIF ( NOT GNOKII_FIND_QUIETLY )
-               ENDIF ( GNOKII_FIND_REQUIRED )
-       ENDIF ( GNOKII_LIBRARIES AND GNOKII_INCLUDE_DIRS )
-ENDIF( NOT GNOKII_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( GNOKII_LIBRARIES GNOKII_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindGNUTLS.cmake b/cmake/modules/FindGNUTLS.cmake
deleted file mode 100644 (file)
index 7fbb9de..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# - Try to find GNUTLS 
-# Find GNUTLS headers, libraries and the answer to all questions.
-#
-#  GNUTLS_FOUND               True if gnutls got found
-#  GNUTLS_INCLUDE_DIRS        Location of gnutls headers 
-#  GNUTLS_LIBRARIES           List of libaries to use gnutls 
-#
-# Copyright (c) 2007 Bjoern Ricks <b.ricks@fh-osnabrueck.de>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-IF ( GNUTLS_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( GNUTLS_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( GNUTLS_FIND_REQUIRED )
-
-IF ( GNUTLS_MIN_VERSION )
-       PKG_SEARCH_MODULE( GNUTLS ${_pkgconfig_REQUIRED} gnutls>=${GNUTLS_MIN_VERSION} )
-ELSE ( GNUTLS_MIN_VERSION )
-       PKG_SEARCH_MODULE( GNUTLS ${_pkgconfig_REQUIRED} gnutls )
-ENDIF ( GNUTLS_MIN_VERSION )
-
-
-IF( NOT GNUTLS_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( GNUTLS_INCLUDE_DIRS gnutls/gnutls.h )
-       FIND_LIBRARY( GNUTLS_LIBRARIES gnutls)
-
-       # Report results
-       IF ( GNUTLS_LIBRARIES AND GNUTLS_INCLUDE_DIRS ) 
-               SET( GNUTLS_FOUND 1 )
-               IF ( NOT GNUTLS_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found gnutls: ${GNUTLS_LIBRARIES}" )
-               ENDIF ( NOT GNUTLS_FIND_QUIETLY )
-       ELSE ( GNUTLS_LIBRARIES AND GNUTLS_INCLUDE_DIRS )       
-               IF ( GNUTLS_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find gnutls" )
-               ELSE ( GNUTLS_FIND_REQUIRED )
-                       IF ( NOT GNUTLS_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find gnutls" )       
-                       ENDIF ( NOT GNUTLS_FIND_QUIETLY )
-               ENDIF ( GNUTLS_FIND_REQUIRED )
-       ENDIF ( GNUTLS_LIBRARIES AND GNUTLS_INCLUDE_DIRS )
-ENDIF( NOT GNUTLS_FOUND AND NOT PKG_CONFIG_FOUND )
-
-MARK_AS_ADVANCED( GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIRS )
diff --git a/cmake/modules/FindGOBJECT2.cmake b/cmake/modules/FindGOBJECT2.cmake
deleted file mode 100644 (file)
index d0d4cda..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# - Try to find GObject2 
-# Find GObject2 headers, libraries and the answer to all questions.
-#
-#  GOBJECT2_FOUND               True if GOBJECT2 got found
-#  GOBJECT2_INCLUDE_DIRS        Location of GOBJECT2 headers 
-#  GOBJECT2_LIBRARIES           List of libraries to use GOBJECT2 
-#
-# Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-IF ( GOBJECT2_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( GOBJECT2_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( GOBJECT2_FIND_REQUIRED )
-
-IF ( GOBJECT2_MIN_VERSION )
-       PKG_SEARCH_MODULE( GOBJECT2 ${_pkgconfig_REQUIRED} gobject-2.0>=${GOBJECT2_MIN_VERSION} )
-ELSE ( GOBJECT2_MIN_VERSION )
-       PKG_SEARCH_MODULE( GOBJECT2 ${_pkgconfig_REQUIRED} gobject-2.0 )
-ENDIF ( GOBJECT2_MIN_VERSION )
-
-
-IF( NOT GOBJECT2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( GOBJECT2_INCLUDE_DIRS gobject/gobject.h PATH_SUFFIXES glib-2.0)
-       FIND_LIBRARY( GOBJECT2_LIBRARIES gobject-2.0 )
-
-       # Report results
-       IF ( GOBJECT2_LIBRARIES AND GOBJECT2_INCLUDE_DIRS )     
-               SET( GOBJECT2_FOUND 1 )
-               IF ( NOT GOBJECT2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found GOBJECT2: ${GOBJECT2_LIBRARIES}" )
-               ENDIF ( NOT GOBJECT2_FIND_QUIETLY )
-       ELSE ( GOBJECT2_LIBRARIES AND GOBJECT2_INCLUDE_DIRS )   
-               IF ( GOBJECT2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find GOBJECT2" )
-               ELSE ( GOBJECT2_FIND_REQUIRED )
-                       IF ( NOT GOBJECT2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find GOBJECT2" )     
-                       ENDIF ( NOT GOBJECT2_FIND_QUIETLY )
-               ENDIF ( GOBJECT2_FIND_REQUIRED )
-       ENDIF ( GOBJECT2_LIBRARIES AND GOBJECT2_INCLUDE_DIRS )
-ENDIF( NOT GOBJECT2_FOUND AND NOT PKG_CONFIG_FOUND )
-
-MARK_AS_ADVANCED( GOBJECT2_LIBRARIES GOBJECT2_INCLUDE_DIRS )
diff --git a/cmake/modules/FindGTHREAD2.cmake b/cmake/modules/FindGTHREAD2.cmake
deleted file mode 100644 (file)
index 1618fd3..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-# - Try to find GThread2 
-# Find GThread headers, libraries and the answer to all questions.
-#
-#  GTHREAD2_FOUND               True if GTHREAD2 got found
-#  GTHREAD2_INCLUDE_DIRS        Location of GTHREAD2 headers 
-#  GTHREAD2_LIBRARIES           List of libraries to use GTHREAD2 
-#
-#  Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-IF ( GTHREAD2_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( GTHREAD2_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( GTHREAD2_FIND_REQUIRED )
-
-IF ( GTHREAD2_MIN_VERSION )
-       PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0>=${GTHREAD2_MIN_VERSION} )
-ELSE ( GTHREAD2_MIN_VERSION )
-       PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0 )
-ENDIF ( GTHREAD2_MIN_VERSION )
-
-
-IF( NOT GTHREAD2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( GTHREAD2_INCLUDE_DIRS gthread.h PATH_SUFFIXES glib-2.0/glib GLib.framework/Headers/glib )
-       IF ( APPLE ) 
-               FIND_LIBRARY( GTHREAD2_LIBRARIES glib )
-       ELSE ( APPLE )
-               FIND_LIBRARY( GTHREAD2_LIBRARIES gthread-2.0 )
-       ENDIF ( APPLE )
-       
-       #MESSAGE( STATUS "Gthread headers: ${GTHREAD2_INCLUDE_DIRS}" )
-       #MESSAGE( STATUS "Gthread libs: ${GTHREAD2_LIBRARIES}" )
-       
-       # Report results
-       IF ( GTHREAD2_LIBRARIES AND GTHREAD2_INCLUDE_DIRS )     
-               SET( GTHREAD2_FOUND 1 )
-               IF ( NOT GTHREAD2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found GTHREAD2: ${GTHREAD2_LIBRARIES} ${GTHREAD2_INCLUDE_DIRS}" )
-               ENDIF ( NOT GTHREAD2_FIND_QUIETLY )
-       ELSE ( GTHREAD2_LIBRARIES AND GTHREAD2_INCLUDE_DIRS )   
-               IF ( GTHREAD2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find GTHREAD2" )
-               ELSE ( GTHREAD2_FIND_REQUIRED )
-                       IF ( NOT GTHREAD2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find GTHREAD2" )     
-                       ENDIF ( NOT GTHREAD2_FIND_QUIETLY )
-               ENDIF ( GTHREAD2_FIND_REQUIRED )
-       ENDIF ( GTHREAD2_LIBRARIES AND GTHREAD2_INCLUDE_DIRS )
-ENDIF( NOT GTHREAD2_FOUND AND NOT PKG_CONFIG_FOUND )
-
-MARK_AS_ADVANCED( GTHREAD2_LIBRARIES GTHREAD2_INCLUDE_DIRS )
diff --git a/cmake/modules/FindGTK2.cmake b/cmake/modules/FindGTK2.cmake
deleted file mode 100644 (file)
index 39094b9..0000000
+++ /dev/null
@@ -1,452 +0,0 @@
-# - Try to find GTK2
-# Once done this will define
-#
-#  GTK2_FOUND - System has Boost
-#  GTK2_INCLUDE_DIRS - GTK2 include directory
-#  GTK2_LIBRARIES - Link these to use GTK2
-#  GTK2_LIBRARY_DIRS - The path to where the GTK2 library files are.
-#  GTK2_DEFINITIONS - Compiler switches required for using GTK2
-#
-#  Copyright (c) 2007 Andreas Schneider <mail@cynapses.org>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-set(GTK2_DEBUG ON)
-
-macro(GTK2_DEBUG_MESSAGE _message)
-  if (GTK2_DEBUG)
-    message(STATUS "(DEBUG) ${_message}")
-  endif (GTK2_DEBUG)
-endmacro(GTK2_DEBUG_MESSAGE _message)
-
-if (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS)
-  # in cache already
-  set(GTK2_FOUND TRUE)
-else (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS)
-  if (UNIX)
-    # use pkg-config to get the directories and then use these values
-    # in the FIND_PATH() and FIND_LIBRARY() calls
-    include(UsePkgConfig)
-
-    pkgconfig(gtk+-2.0 _GTK2IncDir _GTK2LinkDir _GTK2LinkFlags _GTK2Cflags)
-
-    find_path(GTK2_GTK_INCLUDE_DIR
-      NAMES
-        gtk/gtk.h
-      PATHS
-        $ENV{GTK2_HOME}
-        ${_GTK2IncDir}
-        /usr/include/gtk-2.0
-        /usr/local/include/gtk-2.0
-        /opt/include/gtk-2.0
-        /opt/gnome/include/gtk-2.0
-        /sw/include/gtk-2.0
-    )
-    gtk2_debug_message("GTK2_GTK_INCLUDE_DIR is ${GTK2_GTK_INCLUDE_DIR}")
-
-    # Some Linux distributions (e.g. Red Hat) have glibconfig.h
-    # and glib.h in different directories, so we need to look
-    # for both.
-    #  - Atanas Georgiev <atanas@cs.columbia.edu>
-    pkgconfig(glib-2.0 _GLIB2IncDir _GLIB2LinkDir _GLIB2LinkFlags _GLIB2Cflags)
-    pkgconfig(gmodule-2.0 _GMODULE2IncDir _GMODULE2LinkDir _GMODULE2LinkFlags _GMODULE2Cflags)
-
-    find_path(GTK2_GLIBCONFIG_INCLUDE_DIR
-      NAMES
-        glibconfig.h
-      PATHS
-        ${_GLIB2IncDir}
-        ${_GMODULE2IncDir}
-        /opt/gnome/lib64/glib-2.0/include
-        /opt/gnome/lib/glib-2.0/include
-        /opt/lib/glib-2.0/include
-        /usr/lib64/glib-2.0/include
-        /usr/lib/glib-2.0/include
-        /sw/lib/glib-2.0/include
-    )
-    gtk2_debug_message("GTK2_GLIBCONFIG_INCLUDE_DIR is ${GTK2_GLIBCONFIG_INCLUDE_DIR}")
-
-    find_path(GTK2_GLIB_INCLUDE_DIR
-      NAMES
-        glib.h
-      PATHS
-        ${_GLIB2IncDir}
-        ${_GMODULE2IncDir}
-        /opt/include/glib-2.0
-        /opt/gnome/include/glib-2.0
-        /usr/include/glib-2.0
-        /sw/include/glib-2.0
-    )
-    gtk2_debug_message("GTK2_GLIB_INCLUDE_DIR is ${GTK2_GLIB_INCLUDE_DIR}")
-
-    pkgconfig(gdk-2.0 _GDK2IncDir _GDK2LinkDir _GDK2LinkFlags _GDK2Cflags)
-
-    find_path(GTK2_GDK_INCLUDE_DIR
-      NAMES
-        gdkconfig.h
-      PATHS
-        ${_GDK2IncDir}
-        /opt/gnome/lib/gtk-2.0/include
-        /opt/gnome/lib64/gtk-2.0/include
-        /opt/lib/gtk-2.0/include
-        /usr/lib/gtk-2.0/include
-        /usr/lib64/gtk-2.0/include
-        /sw/lib/gtk-2.0/include
-    )
-    gtk2_debug_message("GTK2_GDK_INCLUDE_DIR is ${GTK2_GDK_INCLUDE_DIR}")
-
-    find_path(GTK2_GTKGL_INCLUDE_DIR
-      NAMES
-        gtkgl/gtkglarea.h
-      PATHS
-        ${_GLIB2IncDir}
-        /usr/include
-        /usr/local/include
-        /usr/openwin/share/include
-        /opt/gnome/include
-        /opt/include
-        /sw/include
-    )
-    gtk2_debug_message("GTK2_GTKGL_INCLUDE_DIR is ${GTK2_GTKGL_INCLUDE_DIR}")
-
-    pkgconfig(libglade-2.0 _GLADEIncDir _GLADELinkDir _GLADELinkFlags _GLADECflags)
-
-    find_path(GTK2_GLADE_INCLUDE_DIR
-      NAMES
-        glade/glade.h
-      PATHS
-        ${_GLADEIncDir}
-        /opt/gnome/include/libglade-2.0
-        /usr/include/libglade-2.0
-        /opt/include/libglade-2.0
-        /sw/include/libglade-2.0
-    )
-    gtk2_debug_message("GTK2_GLADE_INCLUDE_DIR is ${GTK2_GLADE_INCLUDE_DIR}")
-
-    pkgconfig(pango _PANGOIncDir _PANGOLinkDir _PANGOLinkFlags _PANGOCflags)
-
-    find_path(GTK2_PANGO_INCLUDE_DIR
-      NAMES
-        pango/pango.h
-      PATHS
-        ${_PANGOIncDir}
-        /usr/include/pango-1.0
-        /opt/gnome/include/pango-1.0
-        /opt/include/pango-1.0
-        /sw/include/pango-1.0
-    )
-    gtk2_debug_message("GTK2_PANGO_INCLUDE_DIR is ${GTK2_PANGO_INCLUDE_DIR}")
-
-    pkgconfig(cairo _CAIROIncDir _CAIROLinkDir _CAIROLinkFlags _CAIROCflags)
-
-    find_path(GTK2_CAIRO_INCLUDE_DIR
-      NAMES
-        cairo.h
-      PATHS
-        ${_CAIROIncDir}
-        /opt/gnome/include/cairo
-        /usr/include
-        /usr/include/cairo
-        /opt/include
-        /opt/include/cairo
-        /sw/include
-        /sw/include/cairo
-    )
-    gtk2_debug_message("GTK2_CAIRO_INCLUDE_DIR is ${GTK2_CAIRO_INCLUDE_DIR}")
-
-    pkgconfig(atk _ATKIncDir _ATKLinkDir _ATKLinkFlags _ATKCflags)
-
-    find_path(GTK2_ATK_INCLUDE_DIR
-      NAMES
-        atk/atk.h
-      PATHS
-        ${_ATKIncDir}
-        /opt/gnome/include/atk-1.0
-        /usr/include/atk-1.0
-        /opt/include/atk-1.0
-        /sw/include/atk-1.0
-    )
-    gtk2_debug_message("GTK2_ATK_INCLUDE_DIR is ${GTK2_ATK_INCLUDE_DIR}")
-
-    find_library(GTK2_GTK_LIBRARY
-      NAMES
-        gtk-x11-2.0
-      PATHS
-        ${_GTK2LinkDir}
-        /usr/lib
-        /usr/local/lib
-        /usr/openwin/lib
-        /usr/X11R6/lib
-        /opt/gnome/lib
-        /opt/lib
-        /sw/lib
-    )
-    gtk2_debug_message("GTK2_GTK_LIBRARY is ${GTK2_GTK_LIBRARY}")
-
-    find_library(GTK2_GDK_LIBRARY
-      NAMES
-        gdk-x11-2.0
-      PATHS
-        ${_GDK2LinkDir}
-        /usr/lib
-        /usr/local/lib
-        /usr/openwin/lib
-        /usr/X11R6/lib
-        /opt/gnome/lib
-        /opt/lib
-        /sw/lib
-    )
-    gtk2_debug_message("GTK2_GDK_LIBRARY is ${GTK2_GDK_LIBRARY}")
-
-    find_library(GTK2_GDK_PIXBUF_LIBRARY
-      NAMES
-        gdk_pixbuf-2.0
-      PATHS
-        ${_GDK2LinkDir}
-        /usr/lib
-        /usr/local/lib
-        /usr/openwin/lib
-        /usr/X11R6/lib
-        /opt/gnome/lib
-        /opt/lib
-        /sw/lib
-    )
-    gtk2_debug_message("GTK2_GDK_PIXBUF_LIBRARY is ${GTK2_GDK_PIXBUF_LIBRARY}")
-
-    find_library(GTK2_GMODULE_LIBRARY
-      NAMES
-        gmodule-2.0
-      PATHS
-        ${_GMODULE2LinkDir}
-        /usr/lib
-        /usr/local/lib
-        /usr/openwin/lib
-        /usr/X11R6/lib
-        /opt/gnome/lib
-        /opt/lib
-        /sw/lib
-    )
-    gtk2_debug_message("GTK2_GMODULE_LIBRARY is ${GTK2_GMODULE_LIBRARY}")
-
-    find_library(GTK2_GTHREAD_LIBRARY
-      NAMES
-        gthread-2.0
-      PATHS
-        ${_GTK2LinkDir}
-        /usr/lib
-        /usr/local/lib
-        /usr/openwin/lib
-        /usr/X11R6/lib
-        /opt/gnome/lib
-        /opt/lib
-        /sw/lib
-    )
-    gtk2_debug_message("GTK2_GTHREAD_LIBRARY is ${GTK2_GTHREAD_LIBRARY}")
-
-    find_library(GTK2_GOBJECT_LIBRARY
-      NAMES
-        gobject-2.0
-      PATHS
-        ${_GTK2LinkDir}
-        /usr/lib
-        /usr/local/lib
-        /usr/openwin/lib
-        /usr/X11R6/lib
-        /opt/gnome/lib
-        /opt/lib
-        /sw/lib
-    )
-    gtk2_debug_message("GTK2_GOBJECT_LIBRARY is ${GTK2_GOBJECT_LIBRARY}")
-
-    find_library(GTK2_GLIB_LIBRARY
-      NAMES
-        glib-2.0
-      PATHS
-        ${_GLIB2LinkDir}
-        /usr/lib
-        /usr/local/lib
-        /usr/openwin/lib
-        /usr/X11R6/lib
-        /opt/gnome/lib
-        /opt/lib
-        /sw/lib
-    )
-    gtk2_debug_message("GTK2_GLIB_LIBRARY is ${GTK2_GLIB_LIBRARY}")
-
-    find_library(GTK2_GTKGL_LIBRARY
-      NAMES
-        gtkgl
-      PATHS
-        ${_GTK2LinkDir}
-        /usr/lib
-        /usr/local/lib
-        /usr/openwin/lib
-        /usr/X11R6/lib
-        /opt/gnome/lib
-        /opt/lib
-        /sw/lib
-    )
-    gtk2_debug_message("GTK2_GTKGL_LIBRARY is ${GTK2_GTKGL_LIBRARY}")
-
-    find_library(GTK2_GLADE_LIBRARY
-      NAMES
-        glade-2.0
-      PATHS
-        ${_GLADELinkDir}
-        /usr/lib
-        /usr/local/lib
-        /usr/openwin/lib
-        /usr/X11R6/lib
-        /opt/gnome/lib
-        /opt/lib
-        /sw/lib
-    )
-    gtk2_debug_message("GTK2_GLADE_LIBRARY is ${GTK2_GLADE_LIBRARY}")
-
-    find_library(GTK2_PANGO_LIBRARY
-      NAMES
-        pango-1.0
-      PATHS
-        ${_PANGOLinkDir}
-        /usr/lib
-        /usr/local/lib
-        /usr/openwin/lib
-        /usr/X11R6/lib
-        /opt/gnome/lib
-        /opt/lib
-        /sw/lib
-    )
-    gtk2_debug_message("GTK2_PANGO_LIBRARY is ${GTK2_PANGO_LIBRARY}")
-
-    find_library(GTK2_CAIRO_LIBRARY
-      NAMES
-        pangocairo-1.0
-      PATHS
-        ${_CAIROLinkDir}
-        /usr/lib
-        /usr/local/lib
-        /usr/openwin/lib
-        /usr/X11R6/lib
-        /opt/gnome/lib
-        /opt/lib
-        /sw/lib
-    )
-    gtk2_debug_message("GTK2_PANGO_LIBRARY is ${GTK2_CAIRO_LIBRARY}")
-
-    find_library(GTK2_ATK_LIBRARY
-      NAMES
-        atk-1.0
-      PATHS
-        ${_ATKinkDir}
-        /usr/lib
-        /usr/local/lib
-        /usr/openwin/lib
-        /usr/X11R6/lib
-        /opt/gnome/lib
-        /opt/lib
-        /sw/lib
-    )
-    gtk2_debug_message("GTK2_ATK_LIBRARY is ${GTK2_ATK_LIBRARY}")
-
-    set(GTK2_INCLUDE_DIRS
-      ${GTK2_GTK_INCLUDE_DIR}
-      ${GTK2_GLIBCONFIG_INCLUDE_DIR}
-      ${GTK2_GLIB_INCLUDE_DIR}
-      ${GTK2_GDK_INCLUDE_DIR}
-      ${GTK2_GLADE_INCLUDE_DIR}
-      ${GTK2_PANGO_INCLUDE_DIR}
-      ${GTK2_CAIRO_INCLUDE_DIR}
-      ${GTK2_ATK_INCLUDE_DIR}
-    )
-
-    if (GTK2_GTK_LIBRARY AND GTK2_GTK_INCLUDE_DIR)
-      if (GTK2_GDK_LIBRARY AND GTK2_GDK_PIXBUF_LIBRARY AND GTK2_GDK_INCLUDE_DIR)
-        if (GTK2_GMODULE_LIBRARY)
-          if (GTK2_GTHREAD_LIBRARY)
-            if (GTK2_GOBJECT_LIBRARY)
-              if (GTK2_GLADE_LIBRARY AND GTK2_GLADE_INCLUDE_DIR)
-                if (GTK2_PANGO_LIBRARY AND GTK2_PANGO_INCLUDE_DIR)
-                  if (GTK2_CAIRO_LIBRARY AND GTK2_CAIRO_INCLUDE_DIR)
-                    if (GTK2_ATK_LIBRARY AND GTK2_ATK_INCLUDE_DIR)
-
-                      # set GTK2 libraries
-                      set (GTK2_LIBRARIES
-                        ${GTK2_GTK_LIBRARY}
-                        ${GTK2_GDK_LIBRARY}
-                        ${GTK2_GDK_PIXBUF_LIBRARY}
-                        ${GTK2_GMODULE_LIBRARY}
-                        ${GTK2_GTHREAD_LIBRARY}
-                        ${GTK2_GOBJECT_LIBRARY}
-                        ${GTK2_GLADE_LIBRARY}
-                        ${GTK2_PANGO_LIBRARY}
-                        ${GTK2_CAIRO_LIBRARY}
-                        ${GTK2_ATK_LIBRARY}
-                      )
-
-                      # check for gtkgl support
-                      if (GTK2_GTKGL_LIBRARY AND GTK2_GTKGL_INCLUDE_DIR)
-                        set(GTK2_GTKGL_FOUND TRUE)
-
-                        set(GTK2_INCLUDE_DIRS
-                          ${GTK2_INCLUDE_DIR}
-                          ${GTK2_GTKGL_INCLUDE_DIR}
-                        )
-
-                        set(GTK2_LIBRARIES
-                          ${GTK2_LIBRARIES}
-                          ${GTK2_GTKGL_LIBRARY}
-                        )
-                      endif (GTK2_GTKGL_LIBRARY AND GTK2_GTKGL_INCLUDE_DIR)
-
-                    else (GTK2_ATK_LIBRARY AND GTK2_ATK_INCLUDE_DIR)
-                      message(SEND_ERROR "Could not find ATK")
-                    endif (GTK2_ATK_LIBRARY AND GTK2_ATK_INCLUDE_DIR)
-                  else (GTK2_CAIRO_LIBRARY AND GTK2_CAIRO_INCLUDE_DIR)
-                    message(SEND_ERROR "Could not find CAIRO")
-                  endif (GTK2_CAIRO_LIBRARY AND GTK2_CAIRO_INCLUDE_DIR)
-                else (GTK2_PANGO_LIBRARY AND GTK2_PANGO_INCLUDE_DIR)
-                  message(SEND_ERROR "Could not find PANGO")
-                endif (GTK2_PANGO_LIBRARY AND GTK2_PANGO_INCLUDE_DIR)
-              else (GTK2_GLADE_LIBRARY AND GTK2_GLADE_INCLUDE_DIR)
-                message(SEND_ERROR "Could not find GLADE")
-              endif (GTK2_GLADE_LIBRARY AND GTK2_GLADE_INCLUDE_DIR)
-            else (GTK2_GOBJECT_LIBRARY)
-              message(SEND_ERROR "Could not find GOBJECT")
-            endif (GTK2_GOBJECT_LIBRARY)
-          else (GTK2_GTHREAD_LIBRARY)
-            message(SEND_ERROR "Could not find GTHREAD")
-          endif (GTK2_GTHREAD_LIBRARY)
-        else (GTK2_GMODULE_LIBRARY)
-          message(SEND_ERROR "Could not find GMODULE")
-        endif (GTK2_GMODULE_LIBRARY)
-      else (GTK2_GDK_LIBRARY AND GTK2_GDK_PIXBUF_LIBRARY AND GTK2_GDK_INCLUDE_DIR)
-        message(SEND_ERROR "Could not find GDK (GDK_PIXBUF)")
-      endif (GTK2_GDK_LIBRARY AND GTK2_GDK_PIXBUF_LIBRARY AND GTK2_GDK_INCLUDE_DIR)
-    else (GTK2_GTK_LIBRARY AND GTK2_GTK_INCLUDE_DIR)
-      message(SEND_ERROR "Could not find GTK2-X11")
-    endif (GTK2_GTK_LIBRARY AND GTK2_GTK_INCLUDE_DIR)
-
-
-    if (GTK2_INCLUDE_DIRS AND GTK2_LIBRARIES)
-       set(GTK2_FOUND TRUE)
-    endif (GTK2_INCLUDE_DIRS AND GTK2_LIBRARIES)
-
-    if (GTK2_FOUND)
-      if (NOT GTK2_FIND_QUIETLY)
-        message(STATUS "Found GTK2: ${GTK2_LIBRARIES}")
-      endif (NOT GTK2_FIND_QUIETLY)
-    else (GTK2_FOUND)
-      if (GTK2_FIND_REQUIRED)
-        message(FATAL_ERROR "Could not find GTK2")
-      endif (GTK2_FIND_REQUIRED)
-    endif (GTK2_FOUND)
-
-    # show the GTK2_INCLUDE_DIRS and GTK2_LIBRARIES variables only in the advanced view
-    mark_as_advanced(GTK2_INCLUDE_DIRS GTK2_LIBRARIES)
-
-  endif (UNIX)
-endif (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS)
-
diff --git a/cmake/modules/FindGnomeVfs2.cmake b/cmake/modules/FindGnomeVfs2.cmake
deleted file mode 100644 (file)
index 5e4f99b..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-# - Try to find gnomevfs2 
-# Find gnomevfs2 headers, libraries and the answer to all questions.
-#
-#  GNOMEVFS2_FOUND               True if gnomevfs2 got found
-#  GNOMEVFS2_INCLUDEDIR          Location of gnomevfs2 headers 
-#  GNOMEVFS2_LIBRARIES           List of libaries to use gnomevfs2
-#  GNOMEVFS2_DEFINITIONS         Definitions to compile gnomevfs2 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about gnome-vfs-2.0.pc settings
-IF ( GnomeVfs2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( GnomeVfs2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( GnomeVfs2_FIND_REQUIRED )
-
-pkg_search_module( GNOMEVFS2 ${_pkgconfig_REQUIRED} gnome-vfs-2.0 )
-
-
-# Look for gnomevfs2 include dir and libraries w/o pkgconfig
-IF ( NOT GNOMEVFS2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _gnomevfs2_include_DIR libgnomevfs/gnome-vfs.h PATH_SUFFIXES gnome-vfs-2.0 
-               PATHS
-               /opt/local/include/
-               /sw/include/
-               /usr/local/include/
-               /usr/include/
-       )
-       FIND_PATH( _gnomevfs2_filesize_include_DIR gnome-vfs-file-size.h 
-               PATHS
-               /opt/gnome/lib64/gnome-vfs-2.0/include
-               /opt/gnome/lib/gnome-vfs-2.0/include
-               /opt/lib/gnome-vfs-2.0/include
-               /opt/local/lib/gnome-vfs-2.0/include
-               /sw/lib/gnome-vfs-2.0/include
-               /usr/lib64/gnome-vfs-2.0/include
-               /usr/lib/gnome-vfs-2.0/include
-       )
-       FIND_LIBRARY( _gnomevfs2_link_DIR gnomevfs-2
-               PATHS
-               /opt/local/lib
-               /sw/lib
-               /usr/lib
-               /usr/local/lib
-               /usr/lib64
-               /usr/local/lib64
-               /opt/lib64
-       )
-       IF ( _gnomevfs2_include_DIR AND _gnomevfs2_filesize_include_DIR AND _gnomevfs2_link_DIR )
-               SET ( _gnomevfs2_FOUND TRUE )
-       ENDIF ( _gnomevfs2_include_DIR AND _gnomevfs2_filesize_include_DIR AND _gnomevfs2_link_DIR )
-
-
-       IF ( _gnomevfs2_FOUND )
-               SET ( GNOMEVFS2_INCLUDE_DIRS ${_gnomevfs2_include_DIR} ${_gnomevfs2_filesize_include_DIR} )
-               SET ( GNOMEVFS2_LIBRARIES ${_gnomevfs2_link_DIR} )
-       ENDIF ( _gnomevfs2_FOUND )
-
-       # Handle dependencies
-       IF ( NOT GCONF2_FOUND )
-               FIND_PACKAGE( GConf2 REQUIRED)
-               IF ( GCONF2_FOUND )
-                       SET ( GNOMEVFS2_INCLUDE_DIRS ${GNOMEVFS2_INCLUDE_DIRS} ${GCONF2_INCLUDE_DIRS} )
-                       SET ( GNOMEVFS2_LIBRARIES ${GNOMEVFS2_LIBRARIES} ${GCONF2_LIBRARIES} )
-               ENDIF ( GCONF2_FOUND )
-       ENDIF ( NOT GCONF2_FOUND )
-        IF ( NOT GLIB2_FOUND )
-                FIND_PACKAGE( GLIB2 REQUIRED)
-
-                IF ( GTHREAD2_FOUND )
-                        SET ( GNOMEVFS2_INCLUDE_DIRS ${GNOMEVFS2_INCLUDE_DIRS} ${GTHREAD2_INCLUDE_DIR} )
-                        SET ( GNOMEVFS2_LIBRARIES ${GNOMEVFS2_LIBRARIES} ${GTHREAD2_LIBRARY} )
-                ENDIF ( GTHREAD2_FOUND )
-                IF ( GMODULE2_FOUND )
-                        SET ( GNOMEVFS2_INCLUDE_DIRS ${GNOMEVFS2_INCLUDE_DIRS} ${GMODULE2_INCLUDE_DIR} )
-                        SET ( GNOMEVFS2_LIBRARIES ${GNOMEVFS2_LIBRARIES} ${GMODULE2_LIBRARY} )
-                ENDIF ( GMODULE2_FOUND )
-                IF ( GOBJECT2_FOUND )
-                        SET ( GNOMEVFS2_INCLUDE_DIRS ${GNOMEVFS2_INCLUDE_DIRS} ${GOBJECT2_INCLUDE_DIR} )
-                        SET ( GNOMEVFS2_LIBRARIES ${GNOMEVFS2_LIBRARIES} ${GOBJECT2_LIBRARY} )
-                ENDIF ( GOBJECT2_FOUND )
-                IF ( GLIB2_FOUND )
-                        SET ( GNOMEVFS2_INCLUDE_DIRS ${GNOMEVFS2_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR} )
-                        SET ( GNOMEVFS2_LIBRARIES ${GNOMEVFS2_LIBRARIES} ${GLIB2_LIBRARY} )
-                ENDIF ( GLIB2_FOUND )
-        ENDIF ( NOT GLIB2_FOUND )
-
-
-       # Report results
-       IF ( GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS AND _gnomevfs2_FOUND )      
-               SET( GNOMEVFS2_FOUND 1 )
-               IF ( NOT GnomeVfs2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found gnomevfs2: ${GNOMEVFS2_LIBRARIES} ${GNOMEVFS2_INCLUDE_DIRS}" )
-               ENDIF ( NOT GnomeVfs2_FIND_QUIETLY )
-       ELSE ( GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS AND _gnomevfs2_FOUND )    
-               IF ( GnomeVfs2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find gnomevfs2" )
-               ELSE ( GnomeVfs2_FIND_REQUIRED )
-                       IF ( NOT GnomeVfs2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find gnomevfs2" )    
-                       ENDIF ( NOT GnomeVfs2_FIND_QUIETLY )
-               ENDIF ( GnomeVfs2_FIND_REQUIRED )
-       ENDIF ( GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS AND _gnomevfs2_FOUND )   
-
-ENDIF ( NOT GNOMEVFS2_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( GNOMEVFS2_LIBRARIES GNOMEVFS2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindIconv.cmake b/cmake/modules/FindIconv.cmake
deleted file mode 100644 (file)
index db141d4..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-
-# This original file is from eiskaltdc at http://code.google.com/p/eiskaltdc/.
-# The file itself does not contain a copyright notice
-# but the whole project is released under GPL v3 (or any later version).
-# Timestamp: 20101-Jan-05
-#
-#  Copyright (c) 2010 Michael Bell <michael.bell@web.de>
-
-if (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-  # Already in cache, be silent
-  set(ICONV_FIND_QUIETLY TRUE)
-endif (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-
-find_path(ICONV_INCLUDE_DIR iconv.h)
-
-find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
-
-if (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-   set (ICONV_FOUND TRUE)
-endif (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-
-set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
-set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
-
-if (ICONV_FOUND)
-  include(CheckCSourceCompiles)
-  CHECK_C_SOURCE_COMPILES("
-  #include <iconv.h>
-  int main(){
-    iconv_t conv = 0;
-    const char* in = 0;
-    size_t ilen = 0;
-    char* out = 0;
-    size_t olen = 0;
-    iconv(conv, &in, &ilen, &out, &olen);
-    return 0;
-  }
-" ICONV_SECOND_ARGUMENT_IS_CONST )
-endif (ICONV_FOUND)
-
-set (CMAKE_REQUIRED_INCLUDES)
-set (CMAKE_REQUIRED_LIBRARIES)
-
-if (ICONV_FOUND)
-  if (NOT ICONV_FIND_QUIETLY)
-    message (STATUS "Found Iconv: ${ICONV_LIBRARIES}")
-  endif (NOT ICONV_FIND_QUIETLY)
-else (ICONV_FOUND)
-  if (Iconv_FIND_REQUIRED)
-    message (FATAL_ERROR "Could not find Iconv")
-  endif (Iconv_FIND_REQUIRED)
-endif (ICONV_FOUND)
-
-MARK_AS_ADVANCED(
-  ICONV_INCLUDE_DIR
-  ICONV_LIBRARIES
-  ICONV_SECOND_ARGUMENT_IS_CONST
-)
diff --git a/cmake/modules/FindKDEPIM3.cmake b/cmake/modules/FindKDEPIM3.cmake
deleted file mode 100644 (file)
index fdbfd16..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# - Try to find KDEPIM3
-# Find KDEPIM3 headers, libraries and the answer to all questions.
-#
-#  KDEPIM3_FOUND               True if KDEPIM3 got found
-#  KDEPIM3_INCLUDE_DIR         Location of KDEPIM3 headers 
-#  KDEPIM3_KCAL_LIBRARIES      List of libaries to use KABC of KDEPIM3 
-#  KDEPIM3_KABC_LIBRARIES      List of libaries to use KCAL of KDEPIM3 
-#  KDEPIM3_DEFINITIONS         Definitions to compile KDEPIM3 
-#
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-FIND_PACKAGE( KDE3 REQUIRED )
-
-FIND_PATH( KDEPIM3_INCLUDE_DIR kdepimmacros.h ${KDE3_INCLUDE_DIR} )
-FIND_LIBRARY( KDEPIM3_KCAL_LIBRARIES kcal ${KDE3_LIB_DIR} )
-FIND_LIBRARY( KDEPIM3_KABC_LIBRARIES kabc ${KDE3_LIB_DIR} )
-
-# Report results
-IF ( KDEPIM3_KCAL_LIBRARIES AND KDEPIM3_KABC_LIBRARIES AND KDEPIM3_INCLUDE_DIR )
-       SET( KDEPIM3_FOUND 1 )
-       IF ( NOT KDEPIM3_FIND_QUIETLY )
-               MESSAGE( STATUS "Found KDE PIM 3: ${KDEPIM3_KABC_LIBRARIES} ${KDEPIM3_KCAL_LIBRARIES}" )
-       ENDIF ( NOT KDEPIM3_FIND_QUIETLY )
-ELSE ( KDEPIM3_KCAL_LIBRARIES AND KDEPIM3_KABC_LIBRARIES AND KDEPIM3_INCLUDE_DIR )
-       IF ( KDEPIM3_FIND_REQUIRED )
-               MESSAGE( SEND_ERROR "Could NOT find KDE PIM 3" )
-       ELSE ( KDEPIM3_FIND_REQUIRED )
-               IF ( NOT KDEPIM3_FIND_QUIETLY )
-                       MESSAGE( STATUS "Could NOT find KDE PIM 3" )
-               ENDIF ( NOT KDEPIM3_FIND_QUIETLY )
-       ENDIF ( KDEPIM3_FIND_REQUIRED )
-ENDIF ( KDEPIM3_KCAL_LIBRARIES AND KDEPIM3_KABC_LIBRARIES AND KDEPIM3_INCLUDE_DIR )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( KDEPIM3_KCAL_LIBRARIES KDEPIM3_KABC_LIBRARIES KDEPIM3_INCLUDE_DIR )
-
diff --git a/cmake/modules/FindLibDbus.cmake b/cmake/modules/FindLibDbus.cmake
deleted file mode 100644 (file)
index 1e66ce7..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# - Try to find LIBDBUS 
-# Find LIBDBUS headers, libraries and the answer to all questions.
-#
-#  LIBDBUS_FOUND               True if libdbus got found
-#  LIBDBUS_INCLUDE_DIRS        Location of libdbus headers 
-#  LIBDBUS_LIBRARIES           List of libraries to use libdbus 
-#
-# Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-IF ( LibDbus_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( LibDbus_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( LibDbus_FIND_REQUIRED )
-
-IF ( LIBDBUS_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBDBUS ${_pkgconfig_REQUIRED} dbus-1>=${LIBDBUS_MIN_VERSION} )
-ELSE ( LIBDBUS_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBDBUS ${_pkgconfig_REQUIRED} dbus-1 )
-ENDIF ( LIBDBUS_MIN_VERSION )
-
-
-IF( NOT LIBDBUS_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( LIBDBUS_INCLUDE_DIRS dbus/dbus.h PATH_SUFFIXES dbus-1.0 dbus )
-       FIND_LIBRARY( LIBDBUS_LIBRARIES dbus dbus-1)
-
-       # Report results
-       IF ( LIBDBUS_LIBRARIES AND LIBDBUS_INCLUDE_DIRS )       
-               SET( LIBDBUS_FOUND 1 )
-               IF ( NOT LIBDBUS_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libdbus: ${LIBDBUS_LIBRARIES}" )
-               ENDIF ( NOT LIBDBUS_FIND_QUIETLY )
-       ELSE ( LIBDBUS_LIBRARIES AND LIBDBUS_INCLUDE_DIRS )     
-               IF ( LIBDBUS_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libdbus" )
-               ELSE ( LIBDBUS_FIND_REQUIRED )
-                       IF ( NOT LIBDBUS_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libdbus" )      
-                       ENDIF ( NOT LIBDBUS_FIND_QUIETLY )
-               ENDIF ( LIBDBUS_FIND_REQUIRED )
-       ENDIF ( LIBDBUS_LIBRARIES AND LIBDBUS_INCLUDE_DIRS )
-ENDIF( NOT LIBDBUS_FOUND AND NOT PKG_CONFIG_FOUND )
-
-MARK_AS_ADVANCED( LIBDBUS_LIBRARIES LIBDBUS_INCLUDE_DIRS )
\ No newline at end of file
diff --git a/cmake/modules/FindLibDbusGlib.cmake b/cmake/modules/FindLibDbusGlib.cmake
deleted file mode 100644 (file)
index 6f366dc..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# - Try to find LIBDBUS GLIB Bindings
-# Find LIBDBUSGLIB headers, libraries and the answer to all questions.
-#
-#  LIBDBUSGLIB_FOUND               True if libdbus-glib got found
-#  LIBDBUSGLIB_INCLUDE_DIRS        Location of libdbus-glib headers 
-#  LIBDBUSGLIB_LIBRARIES           List of libraries to use libdbus-glib 
-#
-# Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-IF ( LibDbusGlib_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( LibDbusGlib_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( LibDbusGlib_FIND_REQUIRED )
-
-IF ( LIBDBUSGLIB_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBDBUSGLIB ${_pkgconfig_REQUIRED} dbus-glib-1>=${LIBDBUSGLIB_MIN_VERSION} )
-ELSE ( LIBDBUSGLIB_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBDBUSGLIB ${_pkgconfig_REQUIRED} dbus-glib-1 )
-ENDIF ( LIBDBUSGLIB_MIN_VERSION )
-
-
-IF( NOT LIBDBUSGLIB_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( LIBDBUSGLIB_INCLUDE_DIRS dbus/dbus-glib.h PATH_SUFFIXES dbus-1.0 dbus )
-       FIND_LIBRARY( LIBDBUSGLIB_LIBRARIES dbus-glib dbus-glib-1)
-
-       # Report results
-       IF ( LIBDBUSGLIB_LIBRARIES AND LIBDBUSGLIB_INCLUDE_DIRS )       
-               SET( LIBDBUSGLIB_FOUND 1 )
-               IF ( NOT LIBDBUSGLIB_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libdbus-glib: ${LIBDBUSGLIB_LIBRARIES}" )
-               ENDIF ( NOT LIBDBUSGLIB_FIND_QUIETLY )
-       ELSE ( LIBDBUSGLIB_LIBRARIES AND LIBDBUSGLIB_INCLUDE_DIRS )     
-               IF ( LIBDBUSGLIB_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libdbus-glib" )
-               ELSE ( LIBDBUSGLIB_FIND_REQUIRED )
-                       IF ( NOT LIBDBUSGLIB_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libdbus-glib" ) 
-                       ENDIF ( NOT LIBDBUSGLIB_FIND_QUIETLY )
-               ENDIF ( LIBDBUSGLIB_FIND_REQUIRED )
-       ENDIF ( LIBDBUSGLIB_LIBRARIES AND LIBDBUSGLIB_INCLUDE_DIRS )
-ENDIF( NOT LIBDBUSGLIB_FOUND AND NOT PKG_CONFIG_FOUND )
-
-MARK_AS_ADVANCED( LIBDBUSGLIB_LIBRARIES LIBDBUSGLIB_INCLUDE_DIRS )
\ No newline at end of file
diff --git a/cmake/modules/FindLibExslt.cmake b/cmake/modules/FindLibExslt.cmake
deleted file mode 100644 (file)
index 11d5214..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-# - Try to find libexslt
-# Find libexslt headers, libraries and the answer to all questions.
-#
-#  LIBEXSLT_FOUND               True if libexslt got found
-#  LIBEXSLT_INCLUDE_DIRS         Location of libexslt headers 
-#  LIBEXSLT_LIBRARIES           List of libaries to use libexslt
-#
-#  Copyright (c) 2008 Daniel Gollub <gollub@b1-systems.de>
-#  Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-# Take care about libexslt.pc settings
-IF ( LibExslt_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( LibExslt_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( LibExslt_FIND_REQUIRED )
-
-IF ( LIBEXSLT_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBEXSLT ${_pkgconfig_REQUIRED} libexslt >= ${LIBEXSLT_MIN_VERSION} )
-ELSE( LIBEXSLT_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBEXSLT ${_pkgconfig_REQUIRED} libexslt )
-ENDIF ( LIBEXSLT_MIN_VERSION )
-
-
-# Look for libexslt include dir and libraries without pkg-config...
-IF ( NOT LIBEXSLT_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libexslt_include_DIR libexslt/exslt.h 
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ 
-       )
-
-       FIND_LIBRARY( _libexslt_link_DIR NAMES exslt libexslt
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 
-       )
-
-       IF ( _libexslt_include_DIR AND _libexslt_link_DIR )
-               SET ( _libexslt_FOUND TRUE )
-       ENDIF ( _libexslt_include_DIR AND _libexslt_link_DIR )
-
-       IF ( _libexslt_FOUND )
-               SET ( LIBEXSLT_INCLUDE_DIRS ${_libexslt_include_DIR} )
-               SET ( LIBEXSLT_LIBRARIES ${_libexslt_link_DIR} )
-       ENDIF ( _libexslt_FOUND )
-
-       # Report results
-       IF ( LIBEXSLT_LIBRARIES AND LIBEXSLT_INCLUDE_DIRS )     
-               SET( LIBEXSLT_FOUND 1 )
-               IF ( NOT LibExslt_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libexslt: ${LIBEXSLT_LIBRARIES} ${LIBEXSLT_INCLUDE_DIRS}" )
-               ENDIF ( NOT LibExslt_FIND_QUIETLY )
-       ELSE ( LIBEXSLT_LIBRARIES AND LIBEXSLT_INCLUDE_DIRS )   
-               IF ( LibExslt_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libexslt" )
-               ELSE ( LibExslt_FIND_REQUIRED )
-                       IF ( NOT LibExslt_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libexslt" )     
-                       ENDIF ( NOT LibExslt_FIND_QUIETLY )
-               ENDIF ( LibExslt_FIND_REQUIRED )
-       ENDIF ( LIBEXSLT_LIBRARIES AND LIBEXSLT_INCLUDE_DIRS )  
-
-ENDIF ( NOT LIBEXSLT_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBEXSLT_LIBRARIES LIBEXSLT_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindLibGCrypt.cmake b/cmake/modules/FindLibGCrypt.cmake
deleted file mode 100644 (file)
index 05284a0..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-# Try and find libgcrypt.
-# As soon as libgcrypt has been found, the following variables will be defined:
-#
-# LIBGCRYPT_FOUND
-# GCRYPT_INCLUDE_DIR
-# GCRYPT_LIBRARY:FILEPATH
-#
-# Copyright (c) 2009 Juergen Leising <jleising@users.sourceforge.net>
-#
-# Redistribution and use is allowed according to the terms of the New
-# BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-MESSAGE(STATUS "checking for libgcrypt...")
-
-FIND_PATH(GCRYPT_INCLUDE_DIR NAMES gcrypt.h 
-                             PATHS /include /usr/include /usr/local/include /usr/share/include /opt/include 
-                             DOC "Try and find the header file gcrypt.h")
-
-FIND_LIBRARY(GCRYPT_LIBRARY NAMES gcrypt
-                            PATHS /usr/lib /lib /usr/local/lib /usr/share/lib /opt/lib /opt/share/lib /var/lib /usr/lib64 /lib64 /usr/local/lib64 /usr/share/lib64 /opt/lib64 /opt/share/lib64 /var/lib64
-                            DOC "Try and find libgcrypt")
-
-IF (GCRYPT_INCLUDE_DIR AND GCRYPT_LIBRARY)
-       SET (LIBGCRYPT_FOUND 1)
-  get_filename_component(GCRYPT_LIBRARY_DIRS ${GCRYPT_LIBRARY} PATH)
-  MESSAGE(STATUS "  Found ${GCRYPT_LIBRARY}")
-ELSE (GCRYPT_INCLUDE_DIR AND GCRYPT_LIBRARY)
-       IF ( LibGCrypt_FIND_REQUIRED )
-         MESSAGE( FATAL_ERROR "  Could NOT find libgcrypt. The ldap plugin needs this library." )
-       ELSE ( LibGCrypt_FIND_REQUIRED )
-               MESSAGE ( STATUS "  Could NOT find libgcrypt.")
-       ENDIF ( LibGCrypt_FIND_REQUIRED )
-ENDIF (GCRYPT_INCLUDE_DIR AND GCRYPT_LIBRARY)
-
-
diff --git a/cmake/modules/FindLibGSSAPIV2.cmake b/cmake/modules/FindLibGSSAPIV2.cmake
deleted file mode 100644 (file)
index a2f874f..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-# Try and find libgssapiv2.
-# As soon as libgssapiv2 has been found, the following variables will be defined:
-#
-# LIBGSSAPIV2_FOUND
-# GSSAPIV2_LIBRARY:FILEPATH
-#
-# Copyright (c) 2009 Juergen Leising <jleising@users.sourceforge.net>
-#
-# Redistribution and use is allowed according to the terms of the New
-# BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-MESSAGE(STATUS "checking for libgssapiv2...")
-
-# No header files required for the ldap plugin.
-
-FIND_LIBRARY(GSSAPIV2_LIBRARY NAMES gssapiv2 
-                              PATHS /usr/lib /lib /usr/local/lib /usr/share/lib /opt/lib /opt/share/lib /var/lib /usr/lib/sasl2 /lib/sasl2 /usr/local/lib/sasl2 /usr/share/lib/sasl2 /opt/lib/sasl2 /opt/share/lib/sasl2 /var/lib/sasl2 /usr/lib64 /lib64 /usr/local/lib64 /usr/share/lib64 /opt/lib64 /opt/share/lib64 /var/lib64 /usr/lib64/sasl2 /lib64/sasl2 /usr/local/lib64/sasl2 /usr/share/lib64/sasl2 /opt/lib64/sasl2 /opt/share/lib64/sasl2 /var/lib64/sasl2
-                              DOC "Try and find libgssapiv2")
-
-IF (GSSAPIV2_LIBRARY)
-       SET (LIBGSSAPIV2_FOUND 1)
-  get_filename_component(GSSAPIV2_LIBRARY_DIRS ${GSSAPIV2_LIBRARY} PATH)
-  MESSAGE(STATUS "  Found ${GSSAPIV2_LIBRARY}")
-ELSE (GSSAPIV2_LIBRARY)
-       IF ( LibGSSAPIV2_FIND_REQUIRED )        
-               MESSAGE( FATAL_ERROR "  Could NOT find libgssapiv2. The ldap plugin needs this library.")
-       ELSE ( LibGSSAPIV2_FIND_REQUIRED )
-         MESSAGE( STATUS "  Could NOT find libgssapiv2. The SASL authentication mechanism GSSAPI (and KERBEROS V5) won't work, therefore. Not a fatal error, however. The ldap plugin itself does NOT need it.")
-       ENDIF ( LibGSSAPIV2_FIND_REQUIRED )
-ENDIF (GSSAPIV2_LIBRARY)
-
diff --git a/cmake/modules/FindLibGcal.cmake b/cmake/modules/FindLibGcal.cmake
deleted file mode 100644 (file)
index 730a7e3..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-# - Try to find libgcal
-# Find libgcal headers, libraries and the answer to all questions.
-#
-#  LIBGCAL_FOUND               True if libgcal got found
-#  LIBGCAL_INCLUDE_DIRS         Location of libgcal headers
-#  LIBGCAL_LIBRARIES           List of libaries to use libgcal
-#  LIBGCAL_DEFINITIONS         Definitions to compile libgcal
-#
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-# Copyright (c) 2008 Adenilson Cavalcanti <savagobr@yahoo.com>
-#  Adapted this to scan for libgcal
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about libgcal.pc settings
-IF ( Libgcal_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( Libgcal_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( Libgcal_FIND_REQUIRED )
-
-IF ( LIBGCAL_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBGCAL ${_pkgconfig_REQUIRED} libgcal>=${LIBGCAL_MIN_VERSION} )
-ELSE ( LIBGCAL_MIN_VERSION )
-       pkg_search_module( LIBGCAL ${_pkgconfig_REQUIRED} libgcal )
-ENDIF ( LIBGCAL_MIN_VERSION )
-
-
-# Look for libgcal include dir and libraries w/o pkgconfig
-IF ( NOT LIBGCAL_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libgcal_include_DIR gcal.h
-               PATHS
-               /opt/local/include/
-               /sw/include/
-               /usr/local/include/
-               /usr/include/
-       )
-       FIND_LIBRARY( _libgcal_link_DIR NAME libgcal
-               PATHS
-               /opt/local/lib
-               /sw/lib
-               /usr/lib
-               /usr/local/lib
-               /usr/lib64
-               /usr/local/lib64
-               /opt/lib64
-       )
-       IF ( _libgcal_include_DIR AND _libgcal_link_DIR )
-               SET ( _libgcal_FOUND TRUE )
-       ENDIF ( _libgcal_include_DIR AND _libgcal_link_DIR )
-
-
-       IF ( _libgcal_FOUND )
-               SET ( LIBGCAL_INCLUDE_DIRS ${_libgcal_include_DIR} )
-               SET ( LIBGCAL_LIBRARIES ${_libgcal_link_DIR} )
-       ENDIF ( _libgcal_FOUND )
-
-       # Report results
-       IF ( LIBGCAL_LIBRARIES AND LIBGCAL_INCLUDE_DIRS AND _libgcal_FOUND )
-               SET( LIBGCAL_FOUND 1 )
-               IF ( NOT Libgcal_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libgcal: ${LIBGCAL_LIBRARIES} ${LIBGCAL_INCLUDE_DIRS}" )
-               ENDIF ( NOT Libgcal_FIND_QUIETLY )
-       ELSE ( LIBGCAL_LIBRARIES AND LIBGCAL_INCLUDE_DIRS AND _libgcal_FOUND )
-               IF ( Libgcal_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libgcal" )
-               ELSE ( Libgcal_FIND_REQUIRED )
-                       IF ( NOT Libgcal_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libgcal" )
-                       ENDIF ( NOT Libgcal_FIND_QUIETLY )
-               ENDIF ( Libgcal_FIND_REQUIRED )
-       ENDIF ( LIBGCAL_LIBRARIES AND LIBGCAL_INCLUDE_DIRS AND _libgcal_FOUND )
-
-ENDIF ( NOT LIBGCAL_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBGCAL_LIBRARIES LIBGCAL_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindLibGlade.cmake b/cmake/modules/FindLibGlade.cmake
deleted file mode 100644 (file)
index 10fffc8..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-# - Try to find LIBGLADE
-# Find LIBGLADE headers, libraries and the answer to all questions.
-#
-#  LIBGLADE_FOUND               True if LIBGLADE got found
-#  LIBGLADE_INCLUDE_DIR         Location of LIBGLADE headers 
-#  LIBGLADE_LIBRARIES           List of libaries to use LIBGLADE
-#  LIBGLADE_DEFINITIONS         Definitions to compile LIBGLADE 
-#
-#  Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-#  Copyright (c) 2008 Daniel Friedrich <daniel.friedrich@opensync.org>
-#  Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-IF ( LibGlade_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( LibGlade_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( LibGlade_FIND_REQUIRED )
-
-IF ( LIBGLADE_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBGLADE ${_pkgconfig_REQUIRED} libglade-2.0>=${LIBGLADE_MIN_VERSION} )
-ELSE ( LIBGLADE_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBGLADE ${_pkgconfig_REQUIRED} libglade-2.0 )
-ENDIF ( LIBGLADE_MIN_VERSION )
-
-
-IF( NOT LIBGLADE_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH(LIBGLADE_INCLUDE_DIRS glade/glade.h )
-       FIND_LIBRARY( LIBGLADE_LIBRARIES glade-2.0)
-
-       # Report results
-       IF ( LIBGLADE_LIBRARIES AND LIBGLADE_INCLUDE_DIRS )     
-               SET( LIBGLADE_FOUND 1 )
-               IF ( NOT LIBGLADE_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found LIBGLADE: ${LIBGLADE_LIBRARIES}" )
-               ENDIF ( NOT LIBGLADE_FIND_QUIETLY )
-       ELSE ( LIBGLADE_LIBRARIES AND LIBGLADE_INCLUDE_DIRS )   
-               IF ( LibGlade_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find LIBGLADE" )
-               ELSE ( LibGlade_FIND_REQUIRED )
-                       IF ( NOT LIBGLADE_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find LIBGLADE" )     
-                       ENDIF ( NOT LIBGLADE_FIND_QUIETLY )
-               ENDIF ( LibGlade_FIND_REQUIRED )
-       ENDIF ( LIBGLADE_LIBRARIES AND LIBGLADE_INCLUDE_DIRS )
-ENDIF( NOT LIBGLADE_FOUND AND NOT PKG_CONFIG_FOUND )   
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBGLADE_LIBRARIES LIBGLADE_INCLUDE_DIRS )
diff --git a/cmake/modules/FindLibGnome2.cmake b/cmake/modules/FindLibGnome2.cmake
deleted file mode 100644 (file)
index 338f2e9..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-# - Try to find libgnome2 
-# Find libgnome2 headers, libraries and the answer to all questions.
-#
-#  LIBGNOME2_FOUND               True if libgnome2 got found
-#  LIBGNOME2_INCLUDEDIR          Location of libgnome2 headers 
-#  LIBGNOME2_LIBRARIES           List of libaries to use libgnome2
-#  LIBGNOME2_DEFINITIONS         Definitions to compile libgnome2 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-
-
-
-
-
-
-INCLUDE( FindPkgConfig )
-# Take care about libgnome-2.0.pc settings
-IF ( LibGnome2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( LibGnome2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( LibGnome2_FIND_REQUIRED )
-
-IF ( LIBGNOME2_MIN_VERSION )
-       pkg_search_module( LIBGNOME2 ${_pkgconfig_REQUIRED} libgnome-2.0>=${LIBGNOME2_MIN_VERSION} )
-ELSE ( LIBGNOME2_MIN_VERSION )
-       pkg_search_module( LIBGNOME2 ${_pkgconfig_REQUIRED} libgnome-2.0 )
-ENDIF ( LIBGNOME2_MIN_VERSION )
-
-
-# Look for libgnome2 include dir and libraries w/o pkgconfig
-IF ( NOT LIBGNOME2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libgnome2_include_DIR libgnome/libgnome.h PATH_SUFFIXES libgnome-2.0 
-               PATHS
-               /opt/local/include/
-               /sw/include/
-               /usr/local/include/
-               /usr/include/
-       )
-       FIND_LIBRARY( _libgnome2_link_DIR gnome-2 
-               PATHS
-               /opt/local/lib
-               /sw/lib
-               /usr/lib
-               /usr/local/lib
-               /usr/lib64
-               /usr/local/lib64
-               /opt/lib64
-       )
-       IF ( _libgnome2_include_DIR AND _libgnome2_link_DIR )
-               SET ( _libgnome2_FOUND TRUE )
-       ENDIF ( _libgnome2_include_DIR AND _libgnome2_link_DIR )
-
-
-       IF ( _libgnome2_FOUND )
-               SET ( LIBGNOME2_INCLUDE_DIRS ${_libgnome2_include_DIR} )
-               SET ( LIBGNOME2_LIBRARIES ${_libgnome2_link_DIR} )
-       ENDIF ( _libgnome2_FOUND )
-
-       # Handle dependencies
-       IF ( NOT BONOBO2_FOUND )
-               FIND_PACKAGE( BONOBO2 REQUIRED)
-               IF ( BONOBO2_FOUND )
-                       SET ( LIBGNOME2_INCLUDE_DIRS ${LIBGNOME2_INCLUDE_DIRS} ${BONOBO2_INCLUDE_DIRS} )
-                       SET ( LIBGNOME2_LIBRARIES ${LIBGNOME2_LIBRARIES} ${BONOBO2_LIBRARIES} )
-               ENDIF ( BONOBO2_FOUND )
-       ENDIF ( NOT BONOBO2_FOUND )
-        IF ( NOT GLIB2_FOUND )
-                FIND_PACKAGE( GLIB2 REQUIRED)
-
-                IF ( GMODULE2_FOUND )
-                        SET ( LIBGNOME2_INCLUDE_DIRS ${LIBGNOME2_INCLUDE_DIRS} ${GMODULE2_INCLUDE_DIR} )
-                        SET ( LIBGNOME2_LIBRARIES ${LIBGNOME2_LIBRARIES} ${GMODULE2_LIBRARY} )
-                ENDIF ( GMODULE2_FOUND )
-                IF ( GLIB2_FOUND )
-                        SET ( LIBGNOME2_INCLUDE_DIRS ${LIBGNOME2_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR} )
-                        SET ( LIBGNOME2_LIBRARIES ${LIBGNOME2_LIBRARIES} ${GLIB2_LIBRARY} )
-                ENDIF ( GLIB2_FOUND )
-        ENDIF ( NOT GLIB2_FOUND )
-
-
-
-       # Report results
-       IF ( LIBGNOME2_LIBRARIES AND LIBGNOME2_INCLUDE_DIRS AND _libgnome2_FOUND )      
-               SET( LIBGNOME2_FOUND 1 )
-               IF ( NOT LibGnome2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libgnome2: ${LIBGNOME2_LIBRARIES} ${LIBGNOME2_INCLUDE_DIRS}" )
-               ENDIF ( NOT LibGnome2_FIND_QUIETLY )
-       ELSE ( LIBGNOME2_LIBRARIES AND LIBGNOME2_INCLUDE_DIRS AND _libgnome2_FOUND )    
-               IF ( LibGnome2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libgnome2" )
-               ELSE ( LibGnome2_FIND_REQUIRED )
-                       IF ( NOT LibGnome2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libgnome2" )    
-                       ENDIF ( NOT LibGnome2_FIND_QUIETLY )
-               ENDIF ( LibGnome2_FIND_REQUIRED )
-       ENDIF ( LIBGNOME2_LIBRARIES AND LIBGNOME2_INCLUDE_DIRS AND _libgnome2_FOUND )   
-
-ENDIF ( NOT LIBGNOME2_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBGNOME2_LIBRARIES LIBGNOME2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindLibLdap.cmake b/cmake/modules/FindLibLdap.cmake
deleted file mode 100644 (file)
index 6ef7874..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-# Try and find libldap.
-# As soon as libldap has been found, the following variables will be defined:
-#
-# LIBLDAP_FOUND
-# LDAP_INCLUDE_DIR
-# LDAP_LIBRARY:FILEPATH
-#
-#
-# Copyright (c) 2009 Juergen Leising <jleising@users.sourceforge.net>
-#
-# Redistribution and use is allowed according to the terms of the New
-# BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-MESSAGE(STATUS "checking for libldap and liblber...")
-
-FIND_PATH(LDAP_INCLUDE_DIR NAMES ldap.h 
-                           PATHS /include /usr/include /usr/local/include /usr/share/include /opt/include 
-                           DOC "Try and find the header file ldap.h")
-
-FIND_PATH(LBER_INCLUDE_DIR NAMES lber.h
-                           PATHS /include /usr/include /usr/local/include /usr/share/include /opt/include ${LDAP_INCLUDE_DIR} 
-                           DOC "Try and find the header file lber.h")
-
-
-
-FIND_LIBRARY(LDAP_LIBRARY NAMES ldap
-                          PATHS /usr/lib /lib /usr/local/lib /usr/share/lib /opt/lib /opt/share/lib /var/lib /usr/lib64 /lib64 /usr/local/lib64 /usr/share/lib64 /opt/lib64 /opt/share/lib64 /var/lib64
-                          DOC "Try and find libldap")
-
-
-IF (LDAP_LIBRARY)
-       get_filename_component(LDAP_LIBRARY_DIRS ${LDAP_LIBRARY} PATH)
-       FIND_LIBRARY(LBER_LIBRARY NAMES lber
-                               PATHS /usr/lib /lib /usr/local/lib /usr/share/lib /opt/lib /opt/share/lib /var/lib /usr/lib64 /lib64 /usr/local/lib64 /usr/share/lib64 /opt/lib64 /opt/share/lib64 /var/lib64 ${LDAP_LIBRARY_DIRS}
-                             DOC "Try and find liblber")
-ELSE (LDAP_LIBRARY)
-       FIND_LIBRARY(LBER_LIBRARY NAMES lber
-                               PATHS /usr/lib /lib /usr/local/lib /usr/share/lib /opt/lib /opt/share/lib /var/lib /usr/lib64 /lib64 /usr/local/lib64 /usr/share/lib64 /opt/lib64 /opt/share/lib64 /var/lib64
-                             DOC "Try and find liblber")
-ENDIF (LDAP_LIBRARY)
-
-
-
-
-IF (LBER_LIBRARY)
-       SET( LIBLBER_FOUND 1 )  
-       get_filename_component(LBER_LIBRARY_DIRS ${LBER_LIBRARY} PATH)
-       MESSAGE(STATUS "  Found ${LBER_LIBRARY}")
-ELSE(LBER_LIBRARY)
-       MESSAGE( STATUS "   Could NOT find liblber.")
-ENDIF (LBER_LIBRARY)
-
-
-
-
-IF (LDAP_INCLUDE_DIR AND LDAP_LIBRARY)
-       SET( LIBLDAP_FOUND 1 )  
-  MESSAGE(STATUS "  Found ${LDAP_LIBRARY}")
-ELSE (LDAP_INCLUDE_DIR AND LDAP_LIBRARY)
-       IF ( LibLdap_FIND_REQUIRED )
-         MESSAGE( FATAL_ERROR "  Could NOT find libldap.  The ldap plugin needs this library.")
-       ELSE ( LibLdap_FIND_REQUIRED )
-               MESSAGE( STATUS "   Could NOT find libldap.")
-       ENDIF ( LibLdap_FIND_REQUIRED )
-ENDIF (LDAP_INCLUDE_DIR AND LDAP_LIBRARY)
-
diff --git a/cmake/modules/FindLibMozLdap.cmake b/cmake/modules/FindLibMozLdap.cmake
deleted file mode 100644 (file)
index 6c814ec..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-# Try and find libmozldap.
-# As soon as libmozldap has been found, the following variables will be defined:
-#
-# LIBMOZLDAP_FOUND (this is or is not #defined)
-# MOZLDAP_INCLUDE_DIR:DIRPATH
-# MOZLDAP_LIBRARY:FILEPATH
-#
-#
-# Copyright (c) 2009 Juergen Leising <jleising@users.sourceforge.net>
-#
-# Redistribution and use is allowed according to the terms of the New
-# BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-MESSAGE(STATUS "checking for libmozldap...")
-
-# Prepare for using pkg-config
-INCLUDE( FindPkgConfig )
-
-IF ( LibMozLdap_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( LibMozLdap_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )
-ENDIF ( LibMozLdap_FIND_REQUIRED )
-
-FIND_PROGRAM( PKGCONFIG_EXECUTABLE NAMES pkg-config )
-
-
-
-# Search for the header files and the libraries by means of pkg-config
-IF ( PKG_CONFIG_FOUND )
-       MESSAGE (STATUS "  Trying to invoke pkg-config...")
-       # PKG_SEARCH_MODULE ( LIBMOZLDAP ${_pkgconfig_REQUIRED} mozldap )
-       PKG_CHECK_MODULES ( LIBMOZLDAP ${_pkgconfig_REQUIRED} mozldap )
-       IF ( LIBMOZLDAP_FOUND )
-               MESSAGE (STATUS "    pkg-config found mozldap.")
-       ELSE ( LIBMOZLDAP_FOUND ) 
-               MESSAGE (STATUS "    pkg-config did NOT find mozldap.")
-       ENDIF ( LIBMOZLDAP_FOUND )
-ENDIF ( PKG_CONFIG_FOUND )
-
-
-
-# Manually searching for header and library.
-# Only, if it has not been found, yet.  Which would also be the case,
-# if pkg-config could not have been found.
-IF ( NOT MOZLDAP_INCLUDE_DIR )
-       MESSAGE (STATUS "  Falling back to searching for mozldap/ldap.h without pkg-config" )
-       FIND_PATH(MOZLDAP_INCLUDE_DIR NAMES mozldap/ldap.h
-                          PATHS /include /usr/include /usr/local/include /usr/share/include /opt/include 
-                          DOC "Try and find the header file mozldap/ldap.h.")
-ENDIF ( NOT MOZLDAP_INCLUDE_DIR )
-
-
-IF ( NOT LIBMOZLDAP_LIBRARIES )
-       MESSAGE (STATUS "  Falling back to searching for libldap60 and libssldap60 without pkg-config" )
-
-       FIND_LIBRARY(MOZLDAP_LIBRARY NAMES ldap60
-                          PATHS /usr/lib /lib /usr/local/lib /usr/share/lib /opt/lib /opt/share/lib /var/lib /usr/lib64 /lib64 /usr/local/lib64 /usr/share/lib64 /opt/lib64 /opt/share/lib64 /var/lib64
-                          DOC "Try and find libldap60 from Mozilla.")
-
-       FIND_LIBRARY(MOZSSLDAP_LIBRARY NAMES ssldap60
-                          PATHS /usr/lib /lib /usr/local/lib /usr/share/lib /opt/lib /opt/share/lib /var/lib /usr/lib64 /lib64 /usr/local/lib64 /usr/share/lib64 /opt/lib64 /opt/share/lib64 /var/lib64
-                          DOC "Try and find libssldap60 from Mozilla.")
-
-       SET ( LIBMOZLDAP_LIBRARIES ${MOZLDAP_LIBRARY} ${MOZSSLDAP_LIBRARY} )
-
-ENDIF ( NOT LIBMOZLDAP_LIBRARIES )
-
-
-
-
-
-# Reviewing the results
-IF (MOZLDAP_INCLUDE_DIR AND MOZLDAP_LIBRARY)
-       SET( LIBMOZLDAP_FOUND 1 )
-  get_filename_component(MOZLDAP_LIBRARY_DIRS ${MOZLDAP_LIBRARY} PATH)
-  MESSAGE(STATUS "  Found ${MOZLDAP_LIBRARY}")
-ELSE (MOZLDAP_INCLUDE_DIR AND MOZLDAP_LIBRARY)
-       IF ( LibMozLdap_FIND_REQUIRED )
-         MESSAGE( FATAL_ERROR "  Could NOT find libldap60 from Mozilla.  The ldap plugin needs this library.")
-       ELSE ( LibMozLdap_FIND_REQUIRED )
-               MESSAGE( STATUS "  Could NOT find libldap60 from Mozilla." )
-               MESSAGE( STATUS "  LIBMOZLDAP_INCLUDE_DIR  = ${LIBMOZLDAP_INCLUDE_DIR}" )
-               MESSAGE( STATUS "  LIBMOZLDAP_INCLUDE_DIRS = ${LIBMOZLDAP_INCLUDE_DIRS}" )
-               MESSAGE( STATUS "  LIBMOZLDAP_LIBRARY = ${LIBMOZLDAP_LIBRARY}" )
-               MESSAGE( STATUS "  LIBMOZLDAP_LIBRARY_DIRS = ${LIBMOZLDAP_LIBRARY_DIRS}" )
-               MESSAGE( STATUS "  LIBMOZLDAP_LIBDIR = ${LIBMOZLDAP_LIBDIR}" )
-       
-
-       ENDIF ( LibMozLdap_FIND_REQUIRED )
-ENDIF (MOZLDAP_INCLUDE_DIR AND MOZLDAP_LIBRARY)
-
diff --git a/cmake/modules/FindLibNeon.cmake b/cmake/modules/FindLibNeon.cmake
deleted file mode 100644 (file)
index 7dffb7b..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-# - Try and find libneon
-# Once done this will define
-#
-#  NEON_FOUND - system has libneon
-#  NEON_INCLUDE_DIR - the libneon include directory
-#  NEON_LIBRARIES - Link these to use libneon
-#  NEON_DEFINITIONS - Compiler switches required for using libneon
-
-# Copyright (c) 2011, Juergen Leising, <jleising@users.sourceforge.net>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-IF (NEON_INCLUDE_DIR AND NEON_LIBRARIES)
-    SET(NEON_FIND_QUIETLY TRUE)
-ENDIF (NEON_INCLUDE_DIR AND NEON_LIBRARIES)
-
-# Useful for finding out CPPFLAGS, LDFLAGS and features:
-FIND_PROGRAM( NEON_CONFIG_EXECUTABLE NAMES neon-config )
-
-
-
-# 1. Search for the include dirs and for the library by means of cmake
-FIND_PATH(NEON_INCLUDE_DIR NAMES neon/ne_session.h 
-                            PATHS /include /usr/include /usr/local/include /usr/share/include /opt/include /include/neon /usr/include/neon /usr/local/include/neon /usr/share/include/neon /opt/include/neon
-         )
-
-FIND_LIBRARY(NEON_LIBRARIES NAMES neon )
-
-
-
-# 2. Search for the include dirs and for the library by means of neon-config,
-#    if necessary and if possible
-IF (NOT NEON_INCLUDE_DIR OR NOT NEON_LIBRARIES)
-       
-       IF ( NEON_CONFIG_EXECUTABLE )
-               EXECUTE_PROCESS( COMMAND ${NEON_CONFIG_EXECUTABLE} "--libs"
-                                OUTPUT_VARIABLE NEON_LIBRARIES 
-                                OUTPUT_STRIP_TRAILING_WHITESPACE )
-                              
-               EXECUTE_PROCESS( COMMAND ${NEON_CONFIG_EXECUTABLE} "--cflags"
-                                OUTPUT_VARIABLE NEON_DEFINITIONS 
-                                OUTPUT_STRIP_TRAILING_WHITESPACE )     
-
-               EXECUTE_PROCESS( COMMAND ${NEON_CONFIG_EXECUTABLE} "--cflags"
-                                OUTPUT_VARIABLE NEON_INCLUDE_DIR
-                                OUTPUT_STRIP_TRAILING_WHITESPACE )
-
-       ELSE ( NEON_CONFIG_EXECUTABLE )
-               MESSAGE(STATUS "neon-config could NOT be found.")
-
-       ENDIF ( NEON_CONFIG_EXECUTABLE )
-       
-ENDIF (NOT NEON_INCLUDE_DIR OR NOT NEON_LIBRARIES)
-
-
-
-# 3. Search for the include dirs and for the library by means of pkg-config,
-#    if necessary and if possible
-IF (NOT NEON_INCLUDE_DIR OR NOT NEON_LIBRARIES)
-       FIND_PROGRAM( PKGCONFIG_EXECUTABLE NAMES pkg-config )
-
-       IF ( PKG_CONFIG_FOUND )
-       MESSAGE (STATUS "  Trying to invoke pkg-config...")
-       PKG_CHECK_MODULES ( NEON ${_pkgconfig_REQUIRED} neon )
-         IF ( NEON_FOUND )
-         MESSAGE (STATUS "    pkg-config found libneon.")
-                       SET (NEON_INCLUDE_DIR ${NEON_INCLUDE_DIR} )
-         ELSE ( NEON_FOUND ) 
-         MESSAGE (STATUS "    pkg-config did NOT find libneon.")
-         ENDIF ( NEON_FOUND )
-       ENDIF ( PKG_CONFIG_FOUND )
-
-ENDIF (NOT NEON_INCLUDE_DIR OR NOT NEON_LIBRARIES)
-
-IF (NOT NEON_INCLUDE_DIR)
-       SET(NEON_FOUND FALSE)
-ENDIF (NOT NEON_INCLUDE_DIR)
-
-
-
-
-
-# Handle the QUIETLY and REQUIRED arguments and set NEON_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(NEON DEFAULT_MSG NEON_LIBRARIES NEON_INCLUDE_DIR)
-
-
-# The pkg-config and the neon-config are all a bit buggy,
-# aren't they? At least, when it comes to cross-compiling... 
-# Or is it the FIND_PACKAGE_HANDLE_STANDARD_ARGS macro? Don't know :-/
-# Therefore:
-
-# Safety check no. 1: 
-IF (NOT NEON_INCLUDE_DIR)
-       SET(NEON_FOUND 0)
-ENDIF (NOT NEON_INCLUDE_DIR)
-
-# Safety check no. 2
-IF (NEON_FOUND)
-       INCLUDE(CheckLibraryExists)
-       CHECK_LIBRARY_EXISTS(${NEON_LIBRARIES} ne_session_create "" NE_SESSION_CREATE_EXISTS)
-       IF (NOT NE_SESSION_CREATE_EXISTS)
-               MESSAGE(STATUS "NEON_INCLUDE_DIR = \"${NEON_INCLUDE_DIR}\"")
-               MESSAGE(STATUS "NEON_LIBRARIES = \"${NEON_LIBRARIES}\"")
-               MESSAGE(STATUS "NEON_DEFINITIONS = \"${NEON_DEFINITIONS}\"")
-               SET(NEON_FOUND 0)
-       ENDIF (NOT NE_SESSION_CREATE_EXISTS)
-ENDIF (NEON_FOUND)
-
-
-
-# Reporting
-IF (NEON_FOUND)
-       MESSAGE(STATUS "NEON_INCLUDE_DIR = \"${NEON_INCLUDE_DIR}\"")
-       MESSAGE(STATUS "NEON_LIBRARIES = \"${NEON_LIBRARIES}\"")
-       MESSAGE(STATUS "NEON_DEFINITIONS = \"${NEON_DEFINITIONS}\"")
-
-       IF ( NEON_CONFIG_EXECUTABLE )
-               # neon-config --support TS_SSL
-               EXECUTE_PROCESS( COMMAND ${NEON_CONFIG_EXECUTABLE} "--support" "ts_ssl"
-                                RESULT_VARIABLE TS_SSL 
-                                OUTPUT_STRIP_TRAILING_WHITESPACE )
-
-               IF (TS_SSL EQUAL 0)
-                       MESSAGE(STATUS "libneon has been compiled with the --enable-threadsafe-ssl flag. You can use SSL/TLS in a multi-threaded application.")
-                       SET( THREAD_SAFE_SSL 1 )
-               ELSE (TS_SSL EQUAL 0)   
-                       MESSAGE(STATUS "libneon has NOT been compiled with the --enable-threadsafe-ssl flag. You should NOT use SSL/TLS in a multithreaded application.")
-                       SET( THREAD_SAFE_SSL 0 )
-               ENDIF (TS_SSL EQUAL 0)
-
-       ENDIF ( NEON_CONFIG_EXECUTABLE )
-
-ELSE (NEON_FOUND)      
-       IF (LibNeon_FIND_REQUIRED)
-               MESSAGE( FATAL_ERROR "Could NOT find libneon" ) 
-       ELSE (LibNeon_FIND_REQUIRED)
-               MESSAGE( STATUS "Could NOT find libneon" )
-       ENDIF (LibNeon_FIND_REQUIRED)
-       
-ENDIF (NEON_FOUND)
-
-MARK_AS_ADVANCED(NEON_INCLUDE_DIR NEON_LIBRARIES)
-
diff --git a/cmake/modules/FindLibSASL2.cmake b/cmake/modules/FindLibSASL2.cmake
deleted file mode 100644 (file)
index e805c58..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-# Try and find libsasl2.
-# As soon as libsasl2 has been found, the following variables will be defined:
-#
-# LIBSASL2_FOUND
-# SASL2_INCLUDE_DIR
-# SASL2_LIBRARY:FILEPATH
-#
-# Copyright (c) 2009 Juergen Leising <jleising@users.sourceforge.net>
-#
-# Redistribution and use is allowed according to the terms of the New
-# BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-MESSAGE(STATUS "checking for libsasl2...")
-
-FIND_PATH(SASL2_INCLUDE_DIR NAMES sasl/sasl.h
-                             PATHS /include /usr/include /usr/local/include /usr/share/include /opt/include 
-                             DOC "Try and find the header file sasl/sasl.h")
-
-FIND_LIBRARY(SASL2_LIBRARY NAMES sasl2
-                           PATHS /usr/lib /lib /usr/local/lib /usr/share/lib /opt/lib /opt/share/lib /var/lib
-                           DOC "Try and find libsasl2")
-
-IF (SASL2_INCLUDE_DIR AND SASL2_LIBRARY)
-       SET (LIBSASL2_FOUND 1)
-  get_filename_component(SASL2_LIBRARY_DIRS ${SASL2_LIBRARY} PATH)
-  MESSAGE(STATUS "  Found ${SASL2_LIBRARY}")
-ELSE (SASL2_INCLUDE_DIR AND SASL2_LIBRARY)
-       IF ( LibSASL2_FIND_REQUIRED     )
-         MESSAGE( FATAL_ERROR "  Could NOT find libsasl2. The ldap plugin needs this library." )
-       ELSE ( LibSASL2_FIND_REQUIRED )
-               MESSAGE( STATUS "  Could NOT find libsasl2.")
-       ENDIF ( LibSASL2_FIND_REQUIRED )
-ENDIF (SASL2_INCLUDE_DIR AND SASL2_LIBRARY)
-
-
diff --git a/cmake/modules/FindLibSoup2.cmake b/cmake/modules/FindLibSoup2.cmake
deleted file mode 100644 (file)
index 68e8fba..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-# - Try to find libsoup
-# Find libsoup headers, libraries and the answer to all questions.
-#
-#  LIBSOUP2_FOUND                True if libsoup2 got found
-#  LIBSOUP2_INCLUDE_DIRS         Location of libsoup2 headers 
-#  LIBSOUP2_LIBRARIES            List of libaries to use libsoup2
-#  LIBSOUP2_LIBRARY_DIRS         Location of libsoup2 library
-#
-#  LIBSOUP22_FOUND               True if libsoup2.2 got found
-#  LIBSOUP22_INCLUDE_DIRS        Location of libsoup2.2 headers 
-#  LIBSOUP22_LIBRARIES           List of libaries to use libsoup2.2
-#  LIBSOUP22_LIBRARY_DIRS        Location of libsoup2.2 library
-#
-#  LIBSOUP24_FOUND               True if libsoup2.4 got found
-#  LIBSOUP24_INCLUDE_DIRS        Location of libsoup2.4 headers 
-#  LIBSOUP24_LIBRARIES           List of libaries to use libsoup2.4
-#  LIBSOUP24_LIBRARY_DIRS        Location of libsoup2.4 library
-#
-#  Set LIBSOUP2_MIN_VERSION to find libsoup2.2 or libsoup2.4 if only 
-#  one of both libraries is supported
-#
-#  Don't use LIBSOUP2_MIN_VERSION if you want to support 
-#  libsoup2.2 and libsoup2.4. 
-#  Instead use LIBSPOUP22_MIN_VERSION and LIBSPOUP24_MIN_VERSION.
-#
-#  Set LIBSPOUP22_MIN_VERSION to find libsoup2.2 which version is
-#  greater than LIBSPOUP22_MIN_VERSION
-#
-#  Set LIBSPOUP24_MIN_VERSION to find libsoup2.4 which version is
-#  greater than LIBSPOUP24_MIN_VERSION
-#
-#  WARNING: It is not possible to set LIBSPOUP22_MIN_VERSION 
-#  and support any version of libsoup2.4 at the same time.
-#  In this situation you have to set LIBSPOUP24_MIN_VERSION also.
-#  The same applies to LIBSPOUP24_MIN_VERSION and libsoup2.2.
-#
-#  Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-#  Copyright (c) 2008 Bjoern Ricks  <bjoern.ricks@gmail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-IF ( LibSoup2_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( LibSoup2_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( LibSoup2_FIND_REQUIRED )
-
-IF ( LIBSOUP2_MIN_VERSION )
-       STRING(REGEX REPLACE "^(2)(\\.)([0-9]*)(\\.?)(.*)" "\\3" LIBSOUP2_VERSION_MINOR "${LIBSOUP2_MIN_VERSION}")
-       IF ( LIBSOUP2_VERSION_MINOR EQUAL "2" )
-               SET( LIBSOUP22_MIN_VERSION "${LIBSOUP2_MIN_VERSION}" )
-       ELSE ( LIBSOUP2_VERSION_MINOR EQUAL "2" )
-               SET( LIBSOUP24_MIN_VERSION "${LIBSOUP2_MIN_VERSION}" )
-       ENDIF ( LIBSOUP2_VERSION_MINOR EQUAL "2" )
-ENDIF ( LIBSOUP2_MIN_VERSION )
-
-# try to find libsoup2.2>=LIBSOUP22_MIN_VERSION
-IF ( LIBSOUP22_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBSOUP22 libsoup-2.2>=${LIBSOUP22_MIN_VERSION} libsoup2>=${LIBSOUP22_MIN_VERSION} )
-ENDIF ( LIBSOUP22_MIN_VERSION )
-
-# try to find libsoup2.4>=LIBSOUP24_MIN_VERSION
-IF ( LIBSOUP24_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBSOUP24 libsoup-2.4>=${LIBSOUP24_MIN_VERSION} libsoup2>=${LIBSOUP24_MIN_VERSION} )
-ENDIF ( LIBSOUP24_MIN_VERSION )        
-
-# try to find any version of libsoup2.4 if LIBSOUP22_MIN_VERSION is not set
-IF ( NOT LIBSOUP24_FOUND AND NOT LIBSOUP22_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBSOUP24 libsoup-2.4 libsoup2 )
-ENDIF ( NOT LIBSOUP24_FOUND AND NOT LIBSOUP22_MIN_VERSION)
-
-# try to find any version of libsoup2.2 if LIBSOUP24_MIN_VERSION is not set
-IF ( NOT LIBSOUP22_FOUND AND NOT LIBSOUP24_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBSOUP22 libsoup-2.2 libsoup2 )
-ENDIF ( NOT LIBSOUP22_FOUND AND NOT LIBSOUP24_MIN_VERSION)
-
-# set LIBSOUP2_ variables
-IF ( LIBSOUP24_FOUND )
-       # prefer libsoup2.4 to libsoup2.2 if both are found
-       SET( LIBSOUP2_FOUND ${LIBSOUP24_FOUND} CACHE INTERNAL "" )
-       SET( LIBSOUP2_INCLUDE_DIRS ${LIBSOUP24_INCLUDE_DIRS} CACHE INTERNAL "" )
-       SET( LIBSOUP2_LIBRARIES ${LIBSOUP24_LIBRARIES} CACHE INTERNAL "" )
-       SET( LIBSOUP2_LIBRARY_DIRS ${LIBSOUP24_LIBRARY_DIRS} CACHE INTERNAL "" )
-       SET( LIBSOUP2_VERSION ${LIBSOUP24_VERSION} CACHE INTERNAL "" )
-ELSEIF ( LIBSOUP22_FOUND )
-       SET( LIBSOUP2_FOUND ${LIBSOUP22_FOUND} CACHE INTERNAL "" )
-       SET( LIBSOUP2_INCLUDE_DIRS ${LIBSOUP22_INCLUDE_DIRS} CACHE INTERNAL "" )
-       SET( LIBSOUP2_LIBRARIES ${LIBSOUP22_LIBRARIES} CACHE INTERNAL "" )
-       SET( LIBSOUP2_LIBRARY_DIRS ${LIBSOUP22_LIBRARY_DIRS} CACHE INTERNAL "" )
-       SET( LIBSOUP2_VERSION ${LIBSOUP22_VERSION} CACHE INTERNAL "" )
-ELSEIF( PKG_CONFIG_FOUND AND LibSoup2_FIND_REQUIRED )
-       # raise an error if both libs are not found 
-       # and FIND_PACKAGE( LibSoup2 REQUIRED ) was called
-       MESSAGE( SEND_ERROR "package libsoup2 not found" )
-ENDIF ( LIBSOUP24_FOUND )
-
-IF( NOT LIBSOUP2_FOUND AND NOT PKG_CONFIG_FOUND )
-       # WARNING:
-       # This case is executed if pkg-config isn't installed.
-       # Currently in this case it is only checked if libsoup2.2 is available.
-       # Therefore please don't use this cmake module without pkg-config!
-       FIND_PATH( _libsoup2_include_DIR libsoup/soup.h PATH_SUFFIXES libsoup libsoup-2.2 )
-       FIND_LIBRARY( _libsoup2_LIBRARY soup-2.2)
-
-       IF ( _libsoup2_include_DIR AND _libsoup2_LIBRARY )
-               SET ( _libsoup2_FOUND TRUE )
-       ENDIF ( _libsoup2_include_DIR AND _libsoup2_LIBRARY )
-
-       IF ( _libsoup2_FOUND )
-               SET ( LIBSOUP2_INCLUDE_DIRS ${_libsoup2_include_DIR} )
-               SET ( LIBSOUP2_LIBRARIES ${_libsoup2_LIBRARY} )
-       
-               # find requited glib2
-               IF( NOT GLIB2_FOUND )
-                       FIND_PACKAGE( GLIB2 REQUIRED )
-                       IF ( GLIB2_FOUND )
-                               SET ( LIBSOUP2_INCLUDE_DIRS ${LIBSOUP2_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} )
-                               SET ( LIBSOUP2_LIBRARIES ${LIBSOUP2_LIBRARIES} ${GLIB2_LIBRARIES} )
-                       ENDIF ( GLIB2_FOUND )
-               ENDIF( NOT GLIB2_FOUND )
-               
-               # find required libxml2
-               IF( NOT LIBXML2_FOUND )
-                       FIND_PACKAGE( LibXml2 REQUIRED )
-                       IF ( LIBXML2_FOUND )
-                               SET ( LIBSOUP2_INCLUDE_DIRS ${LIBSOUP2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} )
-                               SET ( LIBSOUP2_LIBRARIES ${LIBSOUP2_LIBRARIES} ${LIBXML2_LIBRARIES} )
-                       ENDIF( LIBXML2_FOUND )
-               ENDIF( NOT LIBXML2_FOUND )
-               
-               # find required gnutls
-               IF( NOT GNUTLS_FOUND )
-                       FIND_PACKAGE( GNUTLS REQUIRED )
-                       IF ( GNUTLS_FOUND )
-                               SET ( LIBSOUP2_INCLUDE_DIRS ${LIBSOUP2_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIRS} )
-                               SET ( LIBSOUP2_LIBRARIES ${LIBSOUP2_LIBRARIES} ${GNUTLS_LIBRARIES} )
-                       ENDIF( GNUTLS_FOUND )
-               ENDIF( NOT GNUTLS_FOUND )
-       ENDIF ( _libsoup2_FOUND )
-
-       MARK_AS_ADVANCED( _libsoup2_include_DIR  _libsoup2_LIBRARY )
-
-       # Report results
-       IF ( LIBSOUP2_LIBRARIES AND LIBSOUP2_INCLUDE_DIRS AND _libsoup2_FOUND ) 
-               SET( LIBSOUP2_FOUND 1 )
-               IF ( NOT LibSoup2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libsoup2: ${_libsoup2_LIBRARY}" )
-               ENDIF ( NOT LibSoup2_FIND_QUIETLY )
-       ELSE ( LIBSOUP2_LIBRARIES AND LIBSOUP_INCLUDE_DIRS AND _libsoup2_FOUND )        
-               IF ( LibSoup2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libsoup2" )
-               ELSE ( LibSoup2_FIND_REQUIRED )
-                       IF ( NOT LibSoup2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libsoup2" )     
-                       ENDIF ( NOT LibSoup2_FIND_QUIETLY )
-               ENDIF ( LibSoup2_FIND_REQUIRED )
-       ENDIF ( LIBSOUP2_LIBRARIES AND LIBSOUP2_INCLUDE_DIRS AND _libsoup2_FOUND )
-ENDIF( NOT LIBSOUP2_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBSOUP2_LIBRARIES LIBSOUP2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindLibSyncMl.cmake b/cmake/modules/FindLibSyncMl.cmake
deleted file mode 100644 (file)
index 3ebe07f..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-# - Try to find libsyncml
-# Find libsyncml headers, libraries and the answer to all questions.
-#
-#  LIBSYNCML_FOUND               True if libsyncml got found
-#  LIBSYNCML_INCLUDE_DIRS         Location of libsyncml headers 
-#  LIBSYNCML_LIBRARIES           List of libaries to use libsyncml
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-# Take care about libsyncml-x.y.pc settings
-IF ( LibSyncMl_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( LibSyncMl_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( LibSyncMl_FIND_REQUIRED )
-
-# determine API generation
-
-SET( LIBSYNCML_PC "libsyncml-1.0" )
-PKG_SEARCH_MODULE( LIBSYNCML ${_pkgconfig_REQUIRED} libsyncml-3.0 )
-IF ( LIBSYNCML_FOUND )
-       SET ( LIBSYNCML_FOUND FALSE )
-       SET( LIBSYNCML_PC "libsyncml-3.0" )
-ENDIF ( LIBSYNCML_FOUND )
-
-# check for libsyncml-x.y.pc
-
-IF ( LIBSYNCML_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBSYNCML ${_pkgconfig_REQUIRED} ${LIBSYNCML_PC}>=${LIBSYNCML_MIN_VERSION} )
-ELSE( LIBSYNCML_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBSYNCML ${_pkgconfig_REQUIRED} ${LIBSYNCML_PC} )
-ENDIF ( LIBSYNCML_MIN_VERSION )
-
-
-# Look for libsyncml include dir and libraries without pkg-config...
-IF ( NOT LIBSYNCML_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libsyncml_include_DIR libsyncml/syncml.h 
-                       PATH_SUFFIXES ${LIBSYNCML_PC}
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ 
-       )
-
-       FIND_LIBRARY( _libsyncml_link_DIR syncml 
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 
-       )
-
-       IF ( _libsyncml_include_DIR AND _libsyncml_link_DIR )
-               SET ( _libsyncml_FOUND TRUE )
-       ENDIF ( _libsyncml_include_DIR AND _libsyncml_link_DIR )
-
-       IF ( _libsyncml_FOUND )
-               SET ( LIBSYNCML_INCLUDE_DIRS ${_libsyncml_include_DIR} )
-               SET ( LIBSYNCML_LIBRARIES ${_libsyncml_link_DIR} )
-       ENDIF ( _libsyncml_FOUND )
-
-       # Handle dependencies
-       IF( NOT LIBSOUP2_FOUND )
-               SET ( LIBSOUP2_MIN_VERSION "2.2.91" )
-               FIND_PACKAGE( LibSoup2 )
-               IF ( LIBSOUP2_FOUND )
-                       SET ( LIBSYNCML_INCLUDE_DIRS ${LIBSYNCML_INCLUDE_DIRS} ${LIBSOUP2_INCLUDE_DIRS} )
-                       SET ( LIBSYNCML_LIBRARIES ${LIBSYNCML_LIBRARIES} ${LIBSOUP2_LIBRARIES} )
-               ENDIF( LIBSOUP2_FOUND )
-       ENDIF( NOT LIBSOUP2_FOUND )
-       IF( NOT OPENOBEX_FOUND )
-               SET ( OPENOBEX_MIN_VERSION "1.1" )
-               FIND_PACKAGE( OpenObex )
-               IF ( OPENOBEX_FOUND )
-                       SET ( LIBSYNCML_INCLUDE_DIRS ${LIBSYNCML_INCLUDE_DIRS} ${OPENOBEX_INCLUDE_DIRS} )
-                       SET ( LIBSYNCML_LIBRARIES ${LIBSYNCML_LIBRARIES} ${OPENOBEX_LIBRARIES} )
-               ENDIF( OPENOBEX_FOUND )
-       ENDIF( NOT OPENOBEX_FOUND )
-       IF( NOT LIBWBXML2_FOUND )
-               FIND_PACKAGE( LibWbxml2 REQUIRED )
-               IF ( LIBWBXML2_FOUND )
-                       SET ( LIBSYNCML_INCLUDE_DIRS ${LIBSYNCML_INCLUDE_DIRS} ${LIBWBXML2_INCLUDE_DIRS} )
-                       SET ( LIBSYNCML_LIBRARIES ${LIBSYNCML_LIBRARIES} ${LIBWBXML2_LIBRARIES} )
-               ENDIF( LIBWBXML2_FOUND )
-       ENDIF( NOT LIBWBXML2_FOUND )
-       IF( NOT BLUEZ_FOUND )
-               FIND_PACKAGE( BlueZ )
-               IF ( BLUEZ_FOUND )
-                       SET ( LIBSYNCML_INCLUDE_DIRS ${LIBSYNCML_INCLUDE_DIRS} ${BLUEZ_INCLUDE_DIRS} )
-                       SET ( LIBSYNCML_LIBRARIES ${LIBSYNCML_LIBRARIES} ${BLUEZ_LIBRARIES} )
-               ENDIF( BLUEZ_FOUND )
-       ENDIF( NOT BLUEZ_FOUND )
-       IF( NOT LIBXML2_FOUND )
-               FIND_PACKAGE( LibXml2 REQUIRED )
-               IF ( LIBXML2_FOUND )
-                       SET ( LIBSYNCML_INCLUDE_DIRS ${LIBSYNCML_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} )
-                       SET ( LIBSYNCML_LIBRARIES ${LIBSYNCML_LIBRARIES} ${LIBXML2_LIBRARIES} )
-               ENDIF( LIBXML2_FOUND )
-       ENDIF( NOT LIBXML2_FOUND )
-       IF ( NOT GLIB2_FOUND )
-                FIND_PACKAGE( GLIB2 REQUIRED)
-
-                IF ( GOBJECT2_FOUND )
-                        SET ( LIBSYNCML_INCLUDE_DIRS ${LIBSYNCML_INCLUDE_DIRS} ${GOBJECT2_INCLUDE_DIR} )
-                        SET ( LIBSYNCML_LIBRARIES ${LIBSYNCML_LIBRARIES} ${GOBJECT2_LIBRARY} )
-                ENDIF ( GOBJECT2_FOUND )
-                IF ( GTHREAD2_FOUND )
-                        SET ( LIBSYNCML_INCLUDE_DIRS ${LIBSYNCML_INCLUDE_DIRS} ${GTHREAD2_INCLUDE_DIR} )
-                        SET ( LIBSYNCML_LIBRARIES ${LIBSYNCML_LIBRARIES} ${GTHREAD2_LIBRARY} )
-                ENDIF ( GTHREAD2_FOUND )
-                IF ( GLIB2_FOUND )
-                        SET ( LIBSYNCML_INCLUDE_DIRS ${LIBSYNCML_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${GLIBCONFIG_INCLUDE_DIR} )
-                        SET ( LIBSYNCML_LIBRARIES ${LIBSYNCML_LIBRARIES} ${GLIB2_LIBRARIES} )
-                ENDIF ( GLIB2_FOUND )
-        ENDIF ( NOT GLIB2_FOUND )
-
-
-       # Report results
-       IF ( LIBSYNCML_LIBRARIES AND LIBSYNCML_INCLUDE_DIRS )   
-               SET( LIBSYNCML_FOUND 1 )
-               IF ( NOT LibSyncMl_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libsyncml: ${LIBSYNCML_LIBRARIES}" )
-               ENDIF ( NOT LibSyncMl_FIND_QUIETLY )
-       ELSE ( LIBSYNCML_LIBRARIES AND LIBSYNCML_INCLUDE_DIRS ) 
-               IF ( LibSyncMl_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libsyncml" )
-               ELSE ( LibSyncMl_FIND_REQUIRED )
-                       IF ( NOT LibSyncMl_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libsyncml" )    
-                       ENDIF ( NOT LibSyncMl_FIND_QUIETLY )
-               ENDIF ( LibSyncMl_FIND_REQUIRED )
-       ENDIF ( LIBSYNCML_LIBRARIES AND LIBSYNCML_INCLUDE_DIRS )        
-
-ENDIF ( NOT LIBSYNCML_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBSYNCML_LIBRARIES LIBSYNCML_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindLibUuid.cmake b/cmake/modules/FindLibUuid.cmake
deleted file mode 100644 (file)
index cf4bf7f..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# - Try to find LIBUUID 
-# Find LIBUUID headers, libraries and the answer to all questions.
-#
-#  LIBUUID_FOUND               True if libuuid got found
-#  LIBUUID_INCLUDE_DIRS        Location of libuuid headers 
-#  LIBUUID_LIBRARIES           List of libraries to use libuuid 
-#
-# Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-IF ( LibUuid_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( LibUuid_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( LibUuid_FIND_REQUIRED )
-
-IF ( LIBUUID_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBUUID ${_pkgconfig_REQUIRED} uuid>=${LIBUUID_MIN_VERSION} )
-ELSE ( LIBUUID_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBUUID ${_pkgconfig_REQUIRED} uuid )
-ENDIF ( LIBUUID_MIN_VERSION )
-
-
-IF( NOT LIBUUID_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( LIBUUID_INCLUDE_DIRS uuid/uuid.h )
-       FIND_LIBRARY( LIBUUID_LIBRARIES uuid)
-
-       # Report results
-       IF ( LIBUUID_LIBRARIES AND LIBUUID_INCLUDE_DIRS )       
-               SET( LIBUUID_FOUND 1 )
-               IF ( NOT LIBUUID_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libuuid: ${LIBUUID_LIBRARIES}" )
-               ENDIF ( NOT LIBUUID_FIND_QUIETLY )
-       ELSE ( LIBUUID_LIBRARIES AND LIBUUID_INCLUDE_DIRS )     
-               IF ( LIBUUID_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libuuid" )
-               ELSE ( LIBUUID_FIND_REQUIRED )
-                       IF ( NOT LIBUUID_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libuuid" )      
-                       ENDIF ( NOT LIBUUID_FIND_QUIETLY )
-               ENDIF ( LIBUUID_FIND_REQUIRED )
-       ENDIF ( LIBUUID_LIBRARIES AND LIBUUID_INCLUDE_DIRS )
-ENDIF( NOT LIBUUID_FOUND AND NOT PKG_CONFIG_FOUND )
-
-MARK_AS_ADVANCED( LIBUUID_LIBRARIES LIBUUID_INCLUDE_DIRS )
\ No newline at end of file
diff --git a/cmake/modules/FindLibWbxml2.cmake b/cmake/modules/FindLibWbxml2.cmake
deleted file mode 100644 (file)
index 5f04dd1..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-# - Try to find libwbxml
-# Find libwbxml headers, libraries and the answer to all questions.
-#
-#  LIBWBXML2_FOUND               True if libwbxml got found
-#  LIBWBXML2_INCLUDE_DIRS        Location of libwbxml headers 
-#  LIBWBXML2_LIBRARIES           List of libaries to use libwbxml
-#
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Bjoern Ricks  <b.ricks@fh-osnabrueck.de>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-IF ( LibWbxml2_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( LibWbxml2_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( LibWbxml2_FIND_REQUIRED )
-
-IF ( LIBWBXML2_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBWBXML2 libwbxml2>=${LIBWBXML2_MIN_VERSION} ${_pkgconfig_REQUIRED} )
-ELSE ( LIBWBXML2_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBWBXML2 libwbxml2 ${_pkgconfig_REQUIRED} )
-ENDIF ( LIBWBXML2_MIN_VERSION )
-
-
-IF( NOT LIBWBXML2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libwbxml2_include_DIR wbxml.h
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ )
-       FIND_LIBRARY( _libwbxml2_LIBRARY wbxml2
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 )
-       IF ( _libwbxml2_include_DIR AND _libwbxml2_LIBRARY )
-               SET ( _libwbxml2_FOUND TRUE )
-       ENDIF ( _libwbxml2_include_DIR AND _libwbxml2_LIBRARY )
-
-       IF ( _libwbxml2_FOUND )
-               SET ( LIBWBXML2_INCLUDE_DIRS ${_libwbxml2_include_DIR} )
-               SET ( LIBWBXML2_LIBRARIES ${_libwbxml2_LIBRARY} )
-
-               # find required libexpat
-               IF( NOT EXPAT_FOUND )
-                       FIND_PACKAGE( Expat REQUIRED )
-                       IF ( EXPAT_FOUND )
-                               SET ( LIBWBXML2_INCLUDE_DIRS ${LIBWBXML2_INCLUDE_DIRS} ${EXPAT_INCLUDE_DIRS} )
-                               SET ( LIBWBXML2_LIBRARIES ${LIBWBXML2_LIBRARIES} ${EXPAT_LIBRARIES} )
-                       ENDIF( EXPAT_FOUND )
-               ENDIF( NOT EXPAT_FOUND )
-       ENDIF( _libwbxml2_FOUND )
-
-       MARK_AS_ADVANCED( _libwbxml2_include_DIR _libwbxml2_LIBRARY )
-
-       # Report results
-       IF ( LIBWBXML2_LIBRARIES AND LIBWBXML2_INCLUDE_DIRS AND _libwbxml2_FOUND )      
-               SET( LIBWBXML_FOUND 1 )
-               IF ( NOT LibWbxml2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libwbxml2: ${_libwbxml2_LIBRARY}" )
-               ENDIF ( NOT LibWbxml2_FIND_QUIETLY )
-       ELSE ( LIBWBXML2_LIBRARIES AND LIBWBXML2_INCLUDE_DIRS AND _libwbxml2_FOUND )    
-               IF ( LibWbxml2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libwbxml2" )
-               ELSE ( LibWbxml2_FIND_REQUIRED )
-                       IF ( NOT LibWbxml2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libwbxml2" )    
-                       ENDIF ( NOT LibWbxml2_FIND_QUIETLY )
-               ENDIF ( LibWbxml2_FIND_REQUIRED )
-       ENDIF ( LIBWBXML2_LIBRARIES AND LIBWBXML2_INCLUDE_DIRS AND _libwbxml2_FOUND )
-ENDIF( NOT LIBWBXML2_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBWBXML2_LIBRARIES LIBWBXML2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindLibXml2.cmake b/cmake/modules/FindLibXml2.cmake
deleted file mode 100644 (file)
index 126cc9b..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-# - Try to find libxml2 
-# Find libxml2 headers, libraries and the answer to all questions.
-#
-#  LIBXML2_FOUND               True if libxml2 got found
-#  LIBXML2_INCLUDE_DIRS        Location of libxml2 headers 
-#  LIBXML2_LIBRARIES           List of libraries to use libxml2
-#  LIBXML2_DEFINITIONS         Definitions to compile libxml2
-#
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-# Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about libxml2.pc settings
-IF ( LibXml2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( LibXml2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( LibXml2_FIND_REQUIRED )
-
-IF ( LIBXML2_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBXML2 ${_pkgconfig_REQUIRED} libxml-2.0>=${LIBXML2_MIN_VERSION} )
-ELSE ( LIBXML2_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBXML2 ${_pkgconfig_REQUIRED} libxml-2.0 )
-ENDIF ( LIBXML2_MIN_VERSION )
-
-
-# Look for libxml-2.0 include dir and libraries w/o pkgconfig
-IF ( NOT LIBXML2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _libxml2_include_DIR libxml/xpath.h PATH_SUFFIXES libxml2 
-               PATHS
-               /opt/local/include/
-               /sw/include/
-               /usr/local/include/
-               /usr/include/
-       )
-       FIND_LIBRARY( _libxml2_link_DIR NAMES xml2 libxml2 libxml
-               PATHS
-               /opt/local/lib
-               /sw/lib
-               /usr/lib
-               /usr/local/lib
-               /usr/lib64
-               /usr/local/lib64
-               /opt/lib64
-       )
-       IF ( _libxml2_include_DIR AND _libxml2_link_DIR )
-               SET ( _libxml2_FOUND TRUE )
-       ENDIF ( _libxml2_include_DIR AND _libxml2_link_DIR )
-
-
-       IF ( _libxml2_FOUND )
-               SET ( LIBXML2_INCLUDE_DIRS ${_libxml2_include_DIR} )
-               SET ( LIBXML2_LIBRARIES ${_libxml2_link_DIR} )
-       ENDIF ( _libxml2_FOUND )
-
-       # Report results
-       IF ( LIBXML2_LIBRARIES AND LIBXML2_INCLUDE_DIRS AND _libxml2_FOUND )    
-               SET( LIBXML2_FOUND 1 )
-               IF ( NOT LibXml2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found libxml2: ${LIBXML2_LIBRARIES} ${LIBXML2_INCLUDE_DIRS}" )
-               ENDIF ( NOT LibXml2_FIND_QUIETLY )
-       ELSE ( LIBXML2_LIBRARIES AND LIBXML2_INCLUDE_DIRS AND _libxml2_FOUND )  
-               IF ( LibXml2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find libxml2" )
-               ELSE ( LibXml2_FIND_REQUIRED )
-                       IF ( NOT LibXml2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find libxml2" )      
-                       ENDIF ( NOT LibXml2_FIND_QUIETLY )
-               ENDIF ( LibXml2_FIND_REQUIRED )
-       ENDIF ( LIBXML2_LIBRARIES AND LIBXML2_INCLUDE_DIRS AND _libxml2_FOUND ) 
-
-ENDIF ( NOT LIBXML2_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindLibXslt.cmake b/cmake/modules/FindLibXslt.cmake
deleted file mode 100644 (file)
index 28bb0e4..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-# - Try to find LibXslt
-# Once done this will define
-#
-#  LIBXSLT_FOUND - system has LibXslt
-#  LIBXSLT_INCLUDE_DIRS - the LibXslt include directory
-#  LIBXSLT_LIBRARIES - Link these to LibXslt
-#  LIBXSLT_DEFINITIONS - Compiler switches required for using LibXslt
-#
-#  Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-#  Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#      
-
-INCLUDE( FindPkgConfig )
-
-IF ( LibXslt_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( LibXslt_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( LibXslt_FIND_REQUIRED )
-
-IF ( LIBXSLT_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBXSLT ${_pkgconfig_REQUIRED} libxslt>=${LIBXSLT_MIN_VERSION} )
-ELSE ( LIBXSLT_MIN_VERSION )
-       PKG_SEARCH_MODULE( LIBXSLT ${_pkgconfig_REQUIRED} libxslt )
-ENDIF ( LIBXSLT_MIN_VERSION )
-
-
-IF( NOT LIBXSLT_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( LIBXSLT_INCLUDE_DIRS libxslt/xslt.h )
-       FIND_LIBRARY( LIBXSLT_LIBRARIES xslt libxslt )
-
-       # Report results
-       IF ( LIBXSLT_LIBRARIES AND LIBXSLT_INCLUDE_DIRS )       
-               SET( LIBXSLT_FOUND 1 )
-               IF ( NOT LibXslt_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found LibXslt: ${LIBXSLT_LIBRARIES}" )
-               ENDIF ( NOT LibXslt_FIND_QUIETLY )
-       ELSE ( LIBXSLT_LIBRARIES AND LIBXSLT_INCLUDE_DIRS )     
-               IF ( LibXslt_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find LibXslt" )
-               ELSE ( LibXslt_FIND_REQUIRED )
-                       IF ( NOT LibXslt_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find LibXslt" )      
-                       ENDIF ( NOT LibXslt_FIND_QUIETLY )
-               ENDIF ( LibXslt_FIND_REQUIRED )
-       ENDIF ( LIBXSLT_LIBRARIES AND LIBXSLT_INCLUDE_DIRS )    
-ENDIF( NOT LIBXSLT_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBXSLT_LIBRARIES LIBXSLT_INCLUDE_DIRS )
diff --git a/cmake/modules/FindORBit2.cmake b/cmake/modules/FindORBit2.cmake
deleted file mode 100644 (file)
index 58af0e7..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-# - Try to find orbit 
-# Find orbit headers, libraries and the answer to all questions.
-#
-#  ORBIT2_FOUND               True if orbit got found
-#  ORBIT2_INCLUDEDIR          Location of orbit headers 
-#  ORBIT2_LIBRARIES           List of libaries to use orbit 
-#  ORBIT2_DEFINITIONS         Definitions to compile orbit 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-# Take care about ORBit-2.0.pc settings
-IF ( ORBit2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( ORBit2_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( ORBit2_FIND_REQUIRED )
-
-IF ( ORBIT2_MIN_VERSION )
-       pkg_search_module( ORBIT2 ${_pkgconfig_REQUIRED} ORBit-2.0>=${ORBIT2_MIN_VERSION} )
-ELSE ( ORBIT2_MIN_VERSION )
-       pkg_search_module( ORBIT2 ${_pkgconfig_REQUIRED} ORBit-2.0 )
-ENDIF ( ORBIT2_MIN_VERSION )
-
-
-# Look for orbit include dir and libraries w/o pkgconfig
-IF ( NOT ORBIT2_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _orbit2_include_DIR orbit/orbit.h PATH_SUFFIXES orbit-2.0 )
-       FIND_LIBRARY( _orbit2_link_DIR ORBit-2)
-       IF ( _orbit2_include_DIR AND _orbit2_link_DIR )
-               SET ( _orbit2_FOUND TRUE )
-       ENDIF ( _orbit2_include_DIR AND _orbit2_link_DIR )
-
-       IF ( _orbit2_FOUND )
-               SET ( ORBIT2_INCLUDE_DIRS ${_orbit2_include_DIR} )
-               SET ( ORBIT2_LIBRARIES ${_orbit2_link_DIR} )
-       ENDIF ( _orbit2_FOUND )
-
-       IF ( NOT GLIB2_FOUND )
-               FIND_PACKAGE( GLIB2 REQUIRED)
-
-               IF ( GTHREAD2_FOUND )
-                       SET ( ORBIT2_INCLUDE_DIRS ${ORBIT2_INCLUDE_DIRS} ${GTHREAD2_INCLUDE_DIR} )
-                       SET ( ORBIT2_LIBRARIES ${ORBIT2_LIBRARIES} ${GTHREAD2_LIBRARY} )
-               ENDIF ( GTHREAD2_FOUND )
-               IF ( GOBJECT2_FOUND )
-                       SET ( ORBIT2_INCLUDE_DIRS ${ORBIT2_INCLUDE_DIRS} ${GOBJECT2_INCLUDE_DIR} )
-                       SET ( ORBIT2_LIBRARIES ${ORBIT2_LIBRARIES} ${GOBJECT2_LIBRARY} )
-               ENDIF ( GOBJECT2_FOUND )
-               IF ( GLIB2_FOUND )
-                       SET ( ORBIT2_INCLUDE_DIRS ${ORBIT2_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR} )
-                       SET ( ORBIT2_LIBRARIES ${ORBIT2_LIBRARIES} ${GLIB2_LIBRARY} )
-               ENDIF ( GLIB2_FOUND )
-       ENDIF ( NOT GLIB2_FOUND )
-
-       # Report results
-       IF ( ORBIT2_LIBRARIES AND ORBIT2_INCLUDE_DIRS AND _orbit2_FOUND)        
-               SET( ORBIT2_FOUND 1 )
-               IF ( NOT ORBit2_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found ORBit2: ${ORBIT2_LIBRARIES} ${ORBIT2_INCLUDE_DIRS}" )
-               ENDIF ( NOT ORBit2_FIND_QUIETLY )
-       ELSE ( ORBIT2_LIBRARIES AND ORBIT2_INCLUDE_DIRS AND _orbit2_FOUND )     
-               IF ( ORBit2_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find ORBit2" )
-               ELSE ( ORBit2_FIND_REQUIRED )
-                       IF ( NOT ORBit2_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find ORBit2" )       
-                       ENDIF ( NOT ORBit2_FIND_QUIETLY )
-               ENDIF ( ORBit2_FIND_REQUIRED )
-       ENDIF ( ORBIT2_LIBRARIES AND ORBIT2_INCLUDE_DIRS AND _orbit2_FOUND )    
-
-       MARK_AS_ADVANCED( _orbit2_include_DIR _orbit2_link_DIR )
-
-ENDIF ( NOT ORBIT2_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( ORBIT2_LIBRARIES ORBIT2_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindOpenObex.cmake b/cmake/modules/FindOpenObex.cmake
deleted file mode 100644 (file)
index a403ba0..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-# - Try to find OpenObex
-# Find OpenObex headers, libraries and the answer to all questions.
-#
-#  OPENOBEX_FOUND               True if OpenObex got found
-#  OPENOBEX_INCLUDE_DIRS        Location of OpenObex headers 
-#  OPENOBEX_LIBRARIES           List of libaries to use OpenObex
-#  OPENOBEX_HAVE_TCPOBEX        OpenObex supports Tcp over Obex
-#
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007-2008 Bjoern Ricks  <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-IF ( OpenObex_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( OpenObex_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( OpenObex_FIND_REQUIRED )
-
-IF ( OPENOBEX_MIN_VERSION )
-       PKG_SEARCH_MODULE( OPENOBEX openobex>=${OPENOBEX_MIN_VERSION} ${_pkgconfig_REQUIRED} )
-ELSE ( OPENOBEX_MIN_VERSION )
-       PKG_SEARCH_MODULE( OPENOBEX openobex ${_pkgconfig_REQUIRED} )
-ENDIF ( OPENOBEX_MIN_VERSION )
-
-IF( NOT OPENOBEX_FOUND AND NOT PKG_CONFIG_FOUND )
-       # Fallback if pkg-config doesn't exist
-       #MESSAGE( STATUS "FALLBACK" )
-       FIND_PATH( OPENOBEX_INCLUDE_DIRS openobex/obex.h
-               PATHS
-               /opt/local/include/
-               /sw/include/
-               /usr/local/include/
-               /usr/include/ )
-
-
-       FIND_LIBRARY( OPENOBEX_LIBRARIES openobex
-               PATHS
-               /opt/local/lib
-               /sw/lib
-               /usr/lib
-               /usr/local/lib
-               /usr/lib64
-               /usr/local/lib64
-               /opt/lib64 )
-
-
-       # Report results
-       IF ( OPENOBEX_LIBRARIES AND OPENOBEX_INCLUDE_DIRS )     
-               SET( OPENOBEX_FOUND 1 )
-               IF ( NOT OpenObex_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found OpenObex: ${OPENOBEX_LIBRARIES}" )
-               ENDIF ( NOT OpenObex_FIND_QUIETLY )
-       ELSE ( OPENOBEX_LIBRARIES AND OPENOBEX_INCLUDE_DIRS )   
-               IF ( OpenObex_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find OpenObex" )
-               ELSE ( OpenObex_FIND_REQUIRED )
-                       IF ( NOT OpenObex_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find OpenObex" )     
-                       ENDIF ( NOT OpenObex_FIND_QUIETLY )
-               ENDIF ( OpenObex_FIND_REQUIRED )
-       ENDIF ( OPENOBEX_LIBRARIES AND OPENOBEX_INCLUDE_DIRS )  
-ENDIF( NOT OPENOBEX_FOUND AND NOT PKG_CONFIG_FOUND )
-
-IF ( OPENOBEX_FOUND )
-       INCLUDE(CheckFunctionExists)
-       
-       SET( CMAKE_REQUIRED_INCLUDES ${OPENOBEX_INCLUDE_DIRS} )
-       SET( CMAKE_REQUIRED_LIBRARIES ${OPENOBEX_LIBRARIES} )
-       CHECK_FUNCTION_EXISTS( TcpOBEX_ServerRegister OPENOBEX_HAVE_TCPOBEX )
-       #MESSAGE( STATUS "OpenObex has TCP support: ${OPENOBEX_HAVE_TCPOBEX}" )
-ENDIF( OPENOBEX_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( OPENOBEX_LIBRARIES OPENOBEX_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindOpenSync.cmake b/cmake/modules/FindOpenSync.cmake
deleted file mode 100644 (file)
index 972f914..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-# - Try to find OpenSync
-# Find OpenSync headers, libraries and the answer to all questions.
-#
-#  OPENSYNC_FOUND               True if OpenSync got found
-#  OPENSYNC_INCLUDE_DIRS         Location of OpenSync headers 
-#  OPENSYNC_LIBRARIES           List of libaries to use OpenSync
-#
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-# Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-# Take care about libopensync.pc settings
-INCLUDE( FindPkgConfig )
-
-IF ( OpenSync_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( OpenSync_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( OpenSync_FIND_REQUIRED )
-
-IF ( OPENSYNC_MIN_VERSION )
-       PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync1 >=${OPENSYNC_MIN_VERSION} )
-ELSE ( OPENSYNC_MIN_VERSION )
-       PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync1 )
-ENDIF ( OPENSYNC_MIN_VERSION )
-
-FIND_PROGRAM( PKGCONFIG_EXECUTABLE NAMES pkg-config )
-
-IF ( PKGCONFIG_EXECUTABLE )
-       EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS libopensync1 --variable=datadir OUTPUT_VARIABLE _opensync_data_DIR )
-       STRING( REGEX REPLACE "[\r\n]" " " _opensync_data_DIR "${_opensync_data_DIR}"  )
-ENDIF ( PKGCONFIG_EXECUTABLE )
-
-FIND_PATH( OPENSYNC_CMAKE_MODULES "OpenSyncInternal.cmake" PATHS "${_opensync_data_DIR}" PATH_SUFFIXES "cmake/modules" NO_DEFAULT_PATH) 
-FIND_PATH( OPENSYNC_CMAKE_MODULES "OpenSyncInternal.cmake" PATH_SUFFIXES "cmake/modules" ) 
-
-IF ( OPENSYNC_CMAKE_MODULES )
-       SET( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OPENSYNC_CMAKE_MODULES}" )
-ELSE ( OPENSYNC_CMAKE_MODULES )
-       IF ( OpenSync_FIND_REQUIRED )
-               MESSAGE( FATAL_ERROR "OpenSync cmake modules not found. Have you installed opensync core or did you set your PKG_CONFIG_PATH if installing in a non system directory ?" )
-       ENDIF ( OpenSync_FIND_REQUIRED )
-ENDIF ( OPENSYNC_CMAKE_MODULES )
-
-
-# Look for OpenSync include dir and libraries without pkg-config 
-IF( NOT OPENSYNC_FOUND AND NOT PKG_CONFIG_FOUND )
-       # Fallback if pkg-config doesn't exist
-       FIND_PATH( OPENSYNC_INCLUDE_DIRS opensync/opensync.h PATH_SUFFIXES libopensync libopensync1
-                       PATHS
-                       /opt/local/include/
-                       /sw/include/
-                       /usr/local/include/
-                       /usr/include/ )
-
-       FIND_LIBRARY( OPENSYNC_LIBRARIES opensync
-                       PATHS
-                       /opt/local/lib
-                       /sw/lib
-                       /usr/lib
-                       /usr/local/lib
-                       /usr/lib64
-                       /usr/local/lib64
-                       /opt/lib64 )
-
-       # Report results
-       IF ( OPENSYNC_LIBRARIES AND OPENSYNC_INCLUDE_DIRS )     
-               SET( OPENSYNC_FOUND 1 )
-               IF ( NOT OpenSync_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found OpenSync: ${OPENSYNC_LIBRARIES}" )
-               ENDIF ( NOT OpenSync_FIND_QUIETLY )
-       ELSE ( OPENSYNC_LIBRARIES AND OPENSYNC_INCLUDE_DIRS )   
-               IF ( OpenSync_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find OpenSync" )
-               ELSE ( OpenSync_FIND_REQUIRED )
-                       IF ( NOT OpenSync_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find OpenSync" )     
-                       ENDIF ( NOT OpenSync_FIND_QUIETLY )
-               ENDIF ( OpenSync_FIND_REQUIRED )
-       ENDIF ( OPENSYNC_LIBRARIES AND OPENSYNC_INCLUDE_DIRS )  
-ENDIF( NOT OPENSYNC_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( OPENSYNC_LIBRARIES OPENSYNC_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindPilotLink.cmake b/cmake/modules/FindPilotLink.cmake
deleted file mode 100644 (file)
index efbf105..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-# - Try to find PilotLink
-# Find PilotLink headers, libraries and the answer to all questions.
-#
-#  PILOTLINK_FOUND               True if PilotLink got found
-#  PILOTLINK_INCLUDE_DIRS        Location of PilotLink headers 
-#  PILOTLINK_LIBRARIES           List of libaries to use PilotLink
-#  PILOTLINK_DEFINITIONS         Definitions to compile PilotLink 
-#
-#  Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-#  Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-
-IF ( PilotLink_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( PilotLink_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( PilotLink_FIND_REQUIRED )
-
-IF ( PILOTLINK_MIN_VERSION )
-       PKG_SEARCH_MODULE( PILOTLINK ${_pkgconfig_REQUIRED} pilot-link>=${PILOTLINK_MIN_VERSION} )
-ELSE ( PILOTLINK_MIN_VERSION )
-       PKG_SEARCH_MODULE( PILOTLINK ${_pkgconfig_REQUIRED} pilot-link )
-ENDIF ( PILOTLINK_MIN_VERSION )
-
-
-IF( NOT PILOTLINK_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( PILOTLINK_INCLUDE_DIRS pilot-link )
-       FIND_LIBRARY( PILOTLINK_LIBRARIES pisock)
-
-       # Report results
-       IF ( PILOTLINK_LIBRARIES AND PILOTLINK_INCLUDE_DIRS )   
-               SET( PILOTLINK_FOUND 1 )
-               IF ( NOT PilotLink_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found PilotLink: ${PILOTLINK_LIBRARIES}" )
-               ENDIF ( NOT PilotLink_FIND_QUIETLY )
-       ELSE ( PILOTLINK_LIBRARIES AND PILOTLINK_INCLUDE_DIRS ) 
-               IF ( PilotLink_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find PilotLink" )
-               ELSE ( PilotLink_FIND_REQUIRED )
-                       IF ( NOT PilotLink_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find PilotLink" )    
-                       ENDIF ( NOT PilotLink_FIND_QUIETLY )
-               ENDIF ( PilotLink_FIND_REQUIRED )
-       ENDIF ( PILOTLINK_LIBRARIES AND PILOTLINK_INCLUDE_DIRS )        
-ENDIF( NOT PILOTLINK_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( PILOTLINK_LIBRARIES PILOTLINK_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindPkgConfig.cmake b/cmake/modules/FindPkgConfig.cmake
deleted file mode 100644 (file)
index 979a3d9..0000000
+++ /dev/null
@@ -1,373 +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 iff pkg-config works on the system
-#   PKG_CONFIG_EXECUTABLE    ... pathname of the pkg-config program
-#   <PREFIX>_FOUND           ... set to 1 iff 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_OTHERS ... all other linker flags
-#   <XPREFIX>_INCLUDE_DIRS   ... the '-I' preprocessor flags (w/o the '-I')
-#   <XPREFIX>_CFLAGS         ... all required cflags
-#   <XPREFIX>_CFLAGS_OTHERS  ... 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@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)
-
-IF ( PkgConfig_FIND_REQUIRED )
-       SET( PKGCONFIG_REQUIRED "REQUIRED" )
-ELSE( PkgConfig_FIND_REQUIRED )
-       SET( PKGCONFIG_REQUIRED "" )    
-ENDIF ( PkgConfig_FIND_REQUIRED )
-
-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_FOUND)
-    # 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_FOUND)
-    if (PKGCONFIG_REQUIRED AND ${_is_required})
-      message(SEND_ERROR "pkg-config tool not found")
-    endif (PKGCONFIG_REQUIRED AND ${_is_required})
-  endif(PKG_CONFIG_FOUND)
-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})
-    _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})
-endmacro(pkg_check_modules)
-
-###
-macro(pkg_search_module _prefix _module0)
-  if(PKG_CONFIG_FOUND)
-      # 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 )
-  else(PKG_CONFIG_FOUND)
-    if (PKGCONFIG_REQUIRED)
-      message(SEND_ERROR "pkg-config tool not found")
-    endif (PKGCONFIG_REQUIRED)
-  endif(PKG_CONFIG_FOUND)
-  
-endmacro(pkg_search_module)
-
-### Local Variables:
-### mode: cmake
-### End:
diff --git a/cmake/modules/FindPythonLibs.cmake b/cmake/modules/FindPythonLibs.cmake
deleted file mode 100644 (file)
index 6a1061d..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-# - Find python libraries
-# This module finds if Python is installed and determines where the
-# include files and libraries are. It also determines what the name of
-# the library is. This code sets the following variables:
-#
-#  PYTHON_LIBRARIES     = path to the python library
-#  PYTHON_INCLUDE_PATH  = path to where Python.h is found
-#  PYTHON_DEBUG_LIBRARIES = path to the debug library
-#  PYTHON_VERSION = version of python library
-#
-#  The user can set this variable to choose their preferred python 
-#  version to be found:
-#
-#  PREFERRED_PYTHON_VERSION = preferred version of the python library 
-
-INCLUDE(CMakeFindFrameworks)
-
-IF(WIN32)
-  FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
-    NAMES python26_d python25_d python24_d python23_d python22_d python21_d python20_d python
-    PATHS
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs/Debug
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs/Debug
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs/Debug
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs/Debug
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs/Debug
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/libs/Debug
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/libs/Debug
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]/libs/Debug
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs/Debug
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs
-  )
-ENDIF(WIN32)
-
-FIND_LIBRARY(PYTHON_LIBRARY ${PREFERRED_PYTHON_VERSION}
-  NAMES python26 python2.6
-        python25 python2.5
-        python24 python2.4
-        python23 python2.3
-        python22 python2.2
-        python21 python2.1
-        python20 python2.0
-        python16 python1.6
-        python15 python1.5
-
-  PATHS
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]/libs
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs
-
-  PATH_SUFFIXES
-    python2.6/config
-    python2.5/config
-    python2.4/config
-    python2.3/config
-    python2.2/config
-    python2.1/config
-    python2.0/config
-    python1.6/config
-    python1.5/config
-)
-IF(PYTHON_LIBRARY)
-message(STATUS "Found Python: ${PYTHON_LIBRARY}")
-ENDIF(PYTHON_LIBRARY)
-
-# Search for the python framework on Apple.
-CMAKE_FIND_FRAMEWORKS(Python)
-SET(PYTHON_FRAMEWORK_INCLUDES)
-IF(Python_FRAMEWORKS)
-  IF(NOT PYTHON_INCLUDE_PATH)
-    FOREACH(version 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-      FOREACH(dir ${Python_FRAMEWORKS})
-        SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
-          ${dir}/Versions/${version}/include/python${version})
-      ENDFOREACH(dir)
-    ENDFOREACH(version)
-  ENDIF(NOT PYTHON_INCLUDE_PATH)
-ENDIF(Python_FRAMEWORKS)
-
-FIND_PATH(PYTHON_INCLUDE_PATH
-  NAMES Python.h
-
-  PATHS
-    ${PYTHON_FRAMEWORK_INCLUDES}
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/include
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/include
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/include
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/include
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]/include
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]/include
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]/include
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/include
-
-  PATH_SUFFIXES
-    ${PREFERRED_PYTHON_VERSION}
-    python2.6
-    python2.5
-    python2.4
-    python2.3
-    python2.2
-    python2.1
-    python2.0
-    python1.6
-    python1.5
-)
-
-IF (WIN32)
-  MARK_AS_ADVANCED(
-    PYTHON_DEBUG_LIBRARY
-    PYTHON_LIBRARY
-    PYTHON_INCLUDE_PATH
-  )
-ENDIF(WIN32)
-
-
-FIND_PROGRAM( PYTHON_EXECUTABLE NAMES ${PREFERRED_PYTHON_VERSION} python )
-
-IF ( PYTHON_EXECUTABLE )
-       EXEC_PROGRAM( ${PYTHON_EXECUTABLE} ARGS "-c \"import sys; print sys.version[:3]\"" OUTPUT_VARIABLE PYTHON_VERSION )
-       STRING( REGEX REPLACE "[\r\n]" " " PYTHON_VERSION "${PYTHON_VERSION}"  )
-ENDIF ( PYTHON_EXECUTABLE )
-
-# Python Should be built and installed as a Framework on OSX
-IF(Python_FRAMEWORKS)
-  # If a framework has been selected for the include path,
-  # make sure "-framework" is used to link it.
-  IF("${PYTHON_INCLUDE_PATH}" MATCHES "Python\\.framework")
-    SET(PYTHON_LIBRARY "")
-    SET(PYTHON_DEBUG_LIBRARY "")
-  ENDIF("${PYTHON_INCLUDE_PATH}" MATCHES "Python\\.framework")
-  IF(NOT PYTHON_LIBRARY)
-    SET (PYTHON_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE)
-  ENDIF(NOT PYTHON_LIBRARY)
-  IF(NOT PYTHON_DEBUG_LIBRARY)
-    SET (PYTHON_DEBUG_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE)
-  ENDIF(NOT PYTHON_DEBUG_LIBRARY)
-ENDIF(Python_FRAMEWORKS)
-
-# We use PYTHON_LIBRARY and PYTHON_DEBUG_LIBRARY for the cache entries
-# because they are meant to specify the location of a single library.
-# We now set the variables listed by the documentation for this
-# module.
-SET(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
-SET(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}")
-
diff --git a/cmake/modules/FindQt4.cmake b/cmake/modules/FindQt4.cmake
deleted file mode 100644 (file)
index 55c44df..0000000
+++ /dev/null
@@ -1,1468 +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 before doing INCLUDE(${QT_USE_FILE}):
-#                    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
-#                    QT_USE_PHONON
-#
-# The file pointed to by QT_USE_FILE will set up your compile environment
-# by adding include directories, preprocessor defines, and populate a
-# QT_LIBRARIES variable containing all the Qt libraries and their dependencies.
-# Add the QT_LIBRARIES variable to your TARGET_LINK_LIBRARIES.
-#
-# Typical usage could be something like:
-#   FIND_PACKAGE(Qt4)
-#   SET(QT_USE_QTXML 1)
-#   INCLUDE(${QT_USE_FILE})
-#   ADD_EXECUTABLE(myexe main.cpp)
-#   TARGET_LINK_LIBRARIES(myexe ${QT_LIBRARIES})
-#
-#
-# There are also some files that need processing by some Qt tools such as moc
-# and uic.  Listed below are macros that may be used to process those files.
-#  
-#  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_GENERATE_MOC(inputfile outputfile )
-#        creates a rule to run moc on infile and create outfile.
-#        Use this if for some reason QT4_WRAP_CPP() isn't appropriate, e.g.
-#        because you need a custom filename for the moc file or something similar.
-#
-#  macro QT4_AUTOMOC(sourcefile1 sourcefile2 ... )
-#        This macro is still experimental.
-#        It can be used to have moc automatically handled.
-#        So if you have the files foo.h and foo.cpp, and in foo.h a 
-#        a class uses the Q_OBJECT macro, moc has to run on it. If you don't
-#        want to use QT4_WRAP_CPP() (which is reliable and mature), you can insert
-#        #include "foo.moc"
-#        in foo.cpp and then give foo.cpp as argument to QT4_AUTOMOC(). This will the
-#        scan all listed files at cmake-time for such included moc files and if it finds
-#        them cause a rule to be generated to run moc at build time on the 
-#        accompanying header file foo.h.
-#        If a source file has the SKIP_AUTOMOC property set it will be ignored by this macro.
-#
-#  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 qdbuscpp2xml, 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_PHONON_FOUND          True if phonon was found.
-#
-#
-#  QT_DEFINITIONS   Definitions to use when compiling code that uses Qt.
-#                   You do not need to use this if you include QT_USE_FILE.
-#                   The QT_USE_FILE will also define QT_DEBUG and QT_NO_DEBUG
-#                   to fit your current build type.  Those are not contained
-#                   in QT_DEFINITIONS.
-#                  
-#  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.
-#                   You do not need to use this if you include QT_USE_FILE.
-#   
-#
-#  Include directories for the Qt modules are listed here.
-#  You do not need to use these variables if you include QT_USE_FILE.
-#
-#  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_PHONON_INCLUDE_DIR       Path to "include/phonon"
-#                            
-#  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
-#
-# The Phonon library:             QT_PHONON_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_LUPDATE_EXECUTABLE      Where to find the lupdate tool.
-#  QT_LRELEASE_EXECUTABLE     Where to find the lrelease 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 )
-    # make sure we have / and not \ as qmake gives on windows
-    FILE(TO_CMAKE_PATH "${QT_LIBRARY_DIR_TMP}" 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 (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR)
-     EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
-       ARGS "-query QT_INSTALL_BINS"
-       OUTPUT_VARIABLE qt_bins )
-     # make sure we have / and not \ as qmake gives on windows
-     FILE(TO_CMAKE_PATH "${qt_bins}" qt_bins)
-     SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
-  ENDIF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR)
-
-  # ask qmake for the include dir
-  IF (QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR)
-      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
-        ARGS "-query QT_INSTALL_HEADERS" 
-        OUTPUT_VARIABLE qt_headers ) 
-      # make sure we have / and not \ as qmake gives on windows
-      FILE(TO_CMAKE_PATH "${qt_headers}" qt_headers)
-      SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
-  ENDIF(QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR)
-
-
-  # ask qmake for the documentation directory
-  IF (QT_LIBRARY_DIR AND NOT QT_DOC_DIR)
-    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
-      ARGS "-query QT_INSTALL_DOCS"
-      OUTPUT_VARIABLE qt_doc_dir )
-    # make sure we have / and not \ as qmake gives on windows
-    FILE(TO_CMAKE_PATH "${qt_doc_dir}" qt_doc_dir)
-    SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs")
-  ENDIF (QT_LIBRARY_DIR AND NOT QT_DOC_DIR)
-
-  # ask qmake for the mkspecs directory
-  IF (QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR)
-    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
-      ARGS "-query QMAKE_MKSPECS"
-      OUTPUT_VARIABLE qt_mkspecs_dirs )
-    # do not replace : on windows as it might be a drive letter
-    # and windows should already use ; as a separator
-    IF(UNIX)
-      STRING(REPLACE ":" ";" qt_mkspecs_dirs "${qt_mkspecs_dirs}")
-    ENDIF(UNIX)
-    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 (QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR)
-
-  # ask qmake for the plugins directory
-  IF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR)
-    EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
-      ARGS "-query QT_INSTALL_PLUGINS"
-      OUTPUT_VARIABLE qt_plugins_dir )
-    # make sure we have / and not \ as qmake gives on windows
-    FILE(TO_CMAKE_PATH "${qt_plugins_dir}" qt_plugins_dir)
-    SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins")
-  ENDIF (QT_LIBRARY_DIR AND 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
-    ${QT_LIBRARY_DIR}/QtDBus.framework/Headers
-    NO_DEFAULT_PATH
-    )
-  
-  # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
-  FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient
-    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
-    )
-  
-  # Set QT_PHONON_INCLUDE_DIR
-  FIND_PATH(QT_PHONON_INCLUDE_DIR phonon
-    PATHS
-    ${QT_INCLUDE_DIR}/phonon
-    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)
-
-    FIND_LIBRARY(QT_PHONON_LIBRARY NAMES phonon phonon4 phonon_debug phonond4    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(QTASSISTANTCLIENT)
-  _QT4_ADJUST_LIB_VARS(QTHELP)
-  _QT4_ADJUST_LIB_VARS(QTWEBKIT)
-  _QT4_ADJUST_LIB_VARS(QTXMLPATTERNS)
-  _QT4_ADJUST_LIB_VARS(PHONON)
-
-  # 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")
-
-  # make sure we have / and not \ as qmake gives on windows
-  FILE(TO_CMAKE_PATH 
-    "${QT_MOC_EXECUTABLE_INTERNAL}" QT_MOC_EXECUTABLE_INTERNAL)
-  # make sure we have / and not \ as qmake gives on windows
-  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
-    )
-
-  FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
-    NAMES lupdate
-    PATHS ${QT_BINARY_DIR}
-    NO_DEFAULT_PATH
-    )
-
-  FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
-    NAMES lrelease
-    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
-    QT_LUPDATE_EXECUTABLE QT_LRELEASE_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})
-
-     # if Qt is installed only as framework, add -F /library/Frameworks to the moc arguments
-     # otherwise moc can't find the headers in the framework include dirs
-     IF(APPLE  AND  "${QT_QTCORE_INCLUDE_DIR}" MATCHES "/Library/Frameworks/")
-        SET(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-F/Library/Frameworks")
-     ENDIF(APPLE  AND  "${QT_QTCORE_INCLUDE_DIR}" MATCHES "/Library/Frameworks/")
-
-  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 ... )
-
-  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 ... )
-
-  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.
-         # This is required to make uic 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)
-
diff --git a/cmake/modules/FindSWIG.cmake b/cmake/modules/FindSWIG.cmake
deleted file mode 100644 (file)
index 9c18544..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# - Find SWIG
-# This module finds an installed SWIG.  It sets the following variables:
-#  SWIG_FOUND - set to true if SWIG is found
-#  SWIG_DIR - the directory where swig is installed
-#  SWIG_EXECUTABLE - the path to the swig executable
-
-SET(SWIG_FOUND FOOBAR)
-
-
-FILE(GLOB_RECURSE SWIGSWG /usr/share/swig/swig.swg)
-FILE(GLOB_RECURSE SWIGCONFIG /usr/share/swig/SWIGConfig.cmake)
-
-FOREACH(_file ${SWIGCONFIG} ${SWIGSWG} )
-       GET_FILENAME_COMPONENT(SWIG_DIR ${_file} PATH)
-ENDFOREACH(_file)
-
-FIND_PATH(SWIG_DIR
-  SWIGConfig.cmake
-  /usr/share/swig1.3
-  /usr/lib/swig1.3
-  /usr/local/share/swig1.3)
-
-FIND_PATH(SWIG_DIR
-  swig.swg
-  /usr/share/swig1.3
-  /usr/lib/swig1.3
-  /usr/local/share/swig1.3)
-
-IF(EXISTS ${SWIG_DIR})
-  IF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
-    MESSAGE("SWIG_DIR should not be modules subdirectory of CMake")
-  ENDIF("x${SWIG_DIR}x" STREQUAL "x${CMAKE_ROOT}/Modulesx")
-
-  IF(EXISTS ${SWIG_DIR}/SWIGConfig.cmake)
-    INCLUDE(${SWIG_DIR}/SWIGConfig.cmake)
-    SET(SWIG_FOUND 1)
-  ELSE(EXISTS ${SWIG_DIR}/SWIGConfig.cmake)
-    FIND_PROGRAM(SWIG_EXECUTABLE
-      NAMES swig-1.3 swig
-      PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin )
-    SET(SWIG_USE_FILE ${CMAKE_ROOT}/Modules/UseSWIG.cmake)
-  ENDIF(EXISTS ${SWIG_DIR}/SWIGConfig.cmake)
-ENDIF(EXISTS ${SWIG_DIR})
-
-IF("x${SWIG_FOUND}x" STREQUAL "xFOOBARx")
-  SET(SWIG_FOUND 0)
-  IF(EXISTS ${SWIG_DIR})
-    IF(EXISTS ${SWIG_USE_FILE})
-      IF(EXISTS ${SWIG_EXECUTABLE})
-        SET(SWIG_FOUND 1)
-       MESSAGE(STATUS "Found SWIG: ${SWIG_EXECUTABLE}" )
-      ENDIF(EXISTS ${SWIG_EXECUTABLE})
-    ENDIF(EXISTS ${SWIG_USE_FILE})
-  ENDIF(EXISTS ${SWIG_DIR})
-  IF(NOT ${SWIG_FOUND})
-    IF(${SWIG_FIND_REQUIRED})
-      MESSAGE(FATAL_ERROR "SWIG was not found on the system. Please specify the location of SWIG.")
-    ENDIF(${SWIG_FIND_REQUIRED})
-  ENDIF(NOT ${SWIG_FOUND})
-ENDIF("x${SWIG_FOUND}x" STREQUAL "xFOOBARx")
diff --git a/cmake/modules/FindSqlite.cmake b/cmake/modules/FindSqlite.cmake
deleted file mode 100644 (file)
index fe5ae26..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-# - Try to find the sqlite library
-# Once done this will define
-#
-#  SQLITE_FOUND - system has sqlite
-#  SQLITE_INCLUDE_DIRS - the sqlite include directory
-#  SQLITE_LIBRARIES - Link these to use sqlite
-#
-#  Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#      
-
-INCLUDE( FindPkgConfig )
-
-IF ( Sqlite_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( Sqlite_FIND_REQUIRED )
-       SET( _pkgconfig_REQUIRED "" )   
-ENDIF ( Sqlite_FIND_REQUIRED )
-
-IF ( SQLITE_MIN_VERSION )
-       PKG_SEARCH_MODULE( SQLITE ${_pkgconfig_REQUIRED} sqlite>=${SQLITE_MIN_VERSION} )
-ELSE ( SQLITE_MIN_VERSION )
-       PKG_SEARCH_MODULE( SQLITE ${_pkgconfig_REQUIRED} sqlite )
-ENDIF ( SQLITE_MIN_VERSION )
-
-
-IF( NOT SQLITE_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( SQLITE_INCLUDE_DIRS sqlite.h )
-       FIND_LIBRARY( SQLITE_LIBRARIES sqlite )
-
-       # Report results
-       IF ( SQLITE_LIBRARIES AND SQLITE_INCLUDE_DIRS ) 
-               SET( SQLITE_FOUND 1 )
-               IF ( NOT Sqlite_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found Sqlite: ${SQLITE_LIBRARIES}" )
-               ENDIF ( NOT Sqlite_FIND_QUIETLY )
-       ELSE ( SQLITE_LIBRARIES AND SQLITE_INCLUDE_DIRS )       
-               IF ( Sqlite_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find Sqlite" )
-               ELSE ( Sqlite_FIND_REQUIRED )
-                       IF ( NOT Sqlite_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find Sqlite" )       
-                       ENDIF ( NOT Sqlite_FIND_QUIETLY )
-               ENDIF ( Sqlite_FIND_REQUIRED )
-       ENDIF ( SQLITE_LIBRARIES AND SQLITE_INCLUDE_DIRS )      
-ENDIF( NOT SQLITE_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( SQLITE_LIBRARIES SQLITE_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindSqlite3.cmake b/cmake/modules/FindSqlite3.cmake
deleted file mode 100644 (file)
index 9ff5cc2..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-# - Try to find sqlite3 
-# Find sqlite3 headers, libraries and the answer to all questions.
-#
-#  SQLITE3_FOUND               True if sqlite3 got found
-#  SQLITE3_INCLUDEDIR          Location of sqlite3 headers 
-#  SQLITE3_LIBRARIES           List of libaries to use sqlite3
-#  SQLITE3_DEFINITIONS         Definitions to compile sqlite3 
-#
-# Copyright (c) 2007 Juha Tuomala <tuju@iki.fi>
-# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
-# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-INCLUDE( FindPkgConfig )
-# Take care about sqlite3.pc settings
-IF ( Sqlite3_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE ( Sqlite3_FIND_REQUIRED )
-  SET( _pkgconfig_REQUIRED "" )
-ENDIF ( Sqlite3_FIND_REQUIRED )
-
-IF ( SQLITE3_MIN_VERSION )
-       PKG_SEARCH_MODULE( SQLITE3 ${_pkgconfig_REQUIRED} sqlite3>=${SQLITE3_MIN_VERSION} )
-ELSE ( SQLITE3_MIN_VERSION )
-       pkg_search_module( SQLITE3 ${_pkgconfig_REQUIRED} sqlite3 )
-ENDIF ( SQLITE3_MIN_VERSION )
-
-
-# Look for sqlite3 include dir and libraries w/o pkgconfig
-IF ( NOT SQLITE3_FOUND AND NOT PKG_CONFIG_FOUND )
-       FIND_PATH( _sqlite3_include_DIR sqlite3.h 
-               PATHS
-               /opt/local/include/
-               /sw/include/
-               /usr/local/include/
-               /usr/include/
-       )
-       FIND_LIBRARY( _sqlite3_link_DIR sqlite3 
-               PATHS
-               /opt/local/lib
-               /sw/lib
-               /usr/lib
-               /usr/local/lib
-               /usr/lib64
-               /usr/local/lib64
-               /opt/lib64
-       )
-       IF ( _sqlite3_include_DIR AND _sqlite3_link_DIR )
-               SET ( _sqlite3_FOUND TRUE )
-       ENDIF ( _sqlite3_include_DIR AND _sqlite3_link_DIR )
-
-
-       IF ( _sqlite3_FOUND )
-               SET ( SQLITE3_INCLUDE_DIRS ${_sqlite3_include_DIR} )
-               SET ( SQLITE3_LIBRARIES ${_sqlite3_link_DIR} )
-       ENDIF ( _sqlite3_FOUND )
-
-       # Report results
-       IF ( SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS AND _sqlite3_FOUND )    
-               SET( SQLITE3_FOUND 1 )
-               IF ( NOT Sqlite3_FIND_QUIETLY )
-                       MESSAGE( STATUS "Found sqlite3: ${SQLITE3_LIBRARIES} ${SQLITE3_INCLUDE_DIRS}" )
-               ENDIF ( NOT Sqlite3_FIND_QUIETLY )
-       ELSE ( SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS AND _sqlite3_FOUND )  
-               IF ( Sqlite3_FIND_REQUIRED )
-                       MESSAGE( SEND_ERROR "Could NOT find sqlite3" )
-               ELSE ( Sqlite3_FIND_REQUIRED )
-                       IF ( NOT Sqlite3_FIND_QUIETLY )
-                               MESSAGE( STATUS "Could NOT find sqlite3" )      
-                       ENDIF ( NOT Sqlite3_FIND_QUIETLY )
-               ENDIF ( Sqlite3_FIND_REQUIRED )
-       ENDIF ( SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS AND _sqlite3_FOUND ) 
-
-ENDIF ( NOT SQLITE3_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( SQLITE3_LIBRARIES SQLITE3_INCLUDE_DIRS )
-
diff --git a/cmake/modules/FindThunderbirdXpcom.cmake b/cmake/modules/FindThunderbirdXpcom.cmake
deleted file mode 100644 (file)
index c8baabc..0000000
+++ /dev/null
@@ -1,249 +0,0 @@
-# ======================================================
-# This file is part of the mozilla-sync plugin for OpenSync
-# See http://www.KaarPoSoft.dk/bluezync
-# $Id: FindThunderbirdXpcom.cmake 5886 2009-10-22 15:20:12Z henrik $
-# ======================================================
-
-# The purpose of this CMake file is to find Thunderbird and Sunbird files and versions.
-# It should work with Icedove and Iceowl as well
-
-# First we look for a Thunderbird package
-PKG_SEARCH_MODULE ( THUNDERBIRD_XPCOM thunderbird-xpcom icedove-xpcom )
-
-IF ( THUNDERBIRD_XPCOM_FOUND )
-
-       # If we found the Thunderbird package, look for one of the includes, just to be sure
-       FIND_PATH ( THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR mozilla-config.h
-               PATHS ${THUNDERBIRD_XPCOM_INCLUDE_DIRS} )
-       IF( NOT THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR )
-               MESSAGE ( FATAL_ERROR "*** *** Found Thunderbird package, but not mozilla-config.h" )
-       ENDIF ( NOT THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR )
-       # We also need NSPR, so let's make sure it is there
-       FIND_PATH ( NSPR_MAIN_INCLUDE_DIR nspr.h
-               PATHS ${THUNDERBIRD_XPCOM_INCLUDE_DIRS} )
-       IF( NOT NSPR_MAIN_INCLUDE_DIR )
-               MESSAGE ( FATAL_ERROR "*** *** Found Thunderbird package, but not nspr.h" )
-       ENDIF ( NOT NSPR_MAIN_INCLUDE_DIR )
-
-ELSE( THUNDERBIRD_XPCOM_FOUND )
-
-       # We did not find a Thunderbird package, so let us look for the files manually 
-       MESSAGE ( STATUS "  did not find thunderbird package; now looking for thunderbird files" )
-       FIND_PATH (THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR mozilla-config.h
-               PATH_SUFFIXES thunderbird icedove
-               PATHS
-               /opt/local/include/
-               /sw/include/
-               /usr/local/include/
-               /usr/include/
-               /usr/lib64/mozilla-thunderbird/include/
-       )
-       IF ( NOT THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR )
-               MESSAGE ( FATAL_ERROR "*** *** Did not find Thunderbird include directory with mozilla-config.h" )
-       ENDIF ( NOT THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR )
-       FIND_PATH ( NSPR_MAIN_INCLUDE_DIR nspr.h
-               PATH_SUFFIXES nspr nspr4 thunderbird/nspr
-               PATHS
-               /opt/local/include/
-               /sw/include/
-               /usr/local/include/
-               /usr/include/
-       )
-       IF( NOT NSPR_MAIN_INCLUDE_DIR )
-               MESSAGE ( FATAL_ERROR "*** *** Found Thunderbird include directory, but not nspr.h" )
-       ENDIF ( NOT NSPR_MAIN_INCLUDE_DIR )
-       # Usually all the libraries are in one directory, so let us try to find it
-       FIND_LIBRARY ( _xpcom_lib NAMES xpcom libxpcom
-               PATH_SUFFIXES thunderbird icedove
-               PATHS
-               /opt/local/lib
-               /sw/lib
-               /usr/lib
-               /usr/local/lib
-               /usr/lib64
-               /usr/local/lib64
-               /opt/lib64
-       )
-
-       IF ( WIN32 AND NOT _xpcom_lib )
-               GET_FILENAME_COMPONENT ( _tbdir "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\thunderbird.exe]" PATH CACHE)
-       FIND_LIBRARY ( _xpcom_lib NAMES xpcom libxpcom
-               PATHS "${_tbdir}"
-       )
-       ENDIF ( WIN32 AND NOT _xpcom_lib )
-
-       IF ( NOT _xpcom_lib )
-               MESSAGE ( FATAL_ERROR "*** *** Found Thunderbird, but not the xpcom library" )
-       ENDIF ( NOT _xpcom_lib )
-       # We got the actual library, but we need the directory
-       GET_FILENAME_COMPONENT ( THUNDERBIRD_XPCOM_LIBRARY_DIRS "${_xpcom_lib}" PATH )
-       # Usually the only library we need is the xpcom
-       SET ( THUNDERBIRD_XPCOM_LIBRARIES "xpcom" )
-
-       IF ( WIN32 )
-               SET ( THUNDERBIRD_XPCOM_LIBRARIES "xpcom;xpcom_compat;xpcom_core;xpistub" )
-       ENDIF ( WIN32 )
-
-       # For Thunderbird 3.0 we need to link the glue library
-       EXEC_PROGRAM ( thunderbird ARGS "--version"
-               OUTPUT_VARIABLE THUNDERBIRD_XPCOM_VERSION
-               RETURN_VALUE _THUNDERBIRD_XPCOM_VERSION_RET )
-
-       IF ( _THUNDERBIRD_XPCOM_VERSION_RET )
-               EXEC_PROGRAM ( icedove ARGS "--version"
-                       OUTPUT_VARIABLE THUNDERBIRD_XPCOM_VERSION
-                       RETURN_VALUE _THUNDERBIRD_XPCOM_VERSION_RET )
-       ENDIF ( _THUNDERBIRD_XPCOM_VERSION_RET )
-
-       IF ( WIN32 AND _THUNDERBIRD_XPCOM_VERSION_RET )
-               GET_FILENAME_COMPONENT ( _tb_exe "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\thunderbird.exe]" ABSOLUTE CACHE)
-               EXEC_PROGRAM ( "${_tb_exe}" ARGS "--version"
-                       OUTPUT_VARIABLE THUNDERBIRD_XPCOM_VERSION
-                       RETURN_VALUE _THUNDERBIRD_XPCOM_VERSION_RET )
-       ENDIF ( WIN32 AND  _THUNDERBIRD_XPCOM_VERSION_RET )
-
-       IF (_THUNDERBIRD_XPCOM_VERSION_RET )
-                       MESSAGE ( FATAL_ERROR "*** *** Unable execute Thunderbird/Icedove to get its version" )
-       ENDIF ( _THUNDERBIRD_XPCOM_VERSION_RET )
-
-       STRING ( REGEX MATCH ".* ([0-9]\\.[0-9]).*" _THUNDERBIRD_XPCOM_VERSION_OK "${THUNDERBIRD_XPCOM_VERSION}" )
-       IF ( _THUNDERBIRD_XPCOM_VERSION_OK )
-               STRING (REGEX REPLACE ".* ([0-9]\\.[0-9]).*" "\\1" THUNDERBIRD_XPCOM_VERSION "${THUNDERBIRD_XPCOM_VERSION}" )
-       ENDIF ( _THUNDERBIRD_XPCOM_VERSION_OK )
-
-ENDIF( THUNDERBIRD_XPCOM_FOUND )
-
-STRING ( REGEX MATCH ".*([0-9]\\.[0-9]).*" _THUNDERBIRD_XPCOM_VERSION_OK "${THUNDERBIRD_XPCOM_VERSION}" )
-IF ( _THUNDERBIRD_XPCOM_VERSION_OK )
-       # Thunderbird main version
-       STRING (REGEX REPLACE "^([0-9]+)\\..*$" "\\1" THUNDERBIRD_VERSION_MAIN "${THUNDERBIRD_XPCOM_VERSION}" )
-ELSE ( _THUNDERBIRD_XPCOM_VERSION_OK )
-       MESSAGE ( STATUS "Unable to interpret Thunderbird version [${THUNDERBIRD_XPCOM_VERSION}]; continuing anyway" )
-ENDIF ( _THUNDERBIRD_XPCOM_VERSION_OK )
-
-# Thunderbird 3
-IF ( THUNDERBIRD_VERSION_MAIN STREQUAL "3" )
-       SET ( THUNDERBIRD_XPCOM_LIBRARIES "xpcomglue_s;xpcom" )
-       IF ( WIN32 )
-               SET ( THUNDERBIRD_XPCOM_LIBRARIES "xpcomglue_s;xpcom;nspr4" )
-       ENDIF ( WIN32 )
-ENDIF ( THUNDERBIRD_VERSION_MAIN STREQUAL "3" )
-
-# So, by now we should have the following variables set:
-MESSAGE ( STATUS "    THUNDERBIRD_XPCOM_VERSION ${THUNDERBIRD_XPCOM_VERSION}" )
-MESSAGE ( STATUS "    THUNDERBIRD_VERSION_MAIN ${THUNDERBIRD_VERSION_MAIN}" )
-MESSAGE ( STATUS "    THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR ${THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR}" )
-MESSAGE ( STATUS "    NSPR_MAIN_INCLUDE_DIR ${NSPR_MAIN_INCLUDE_DIR}" )
-MESSAGE ( STATUS "    THUNDERBIRD_XPCOM_LIBRARY_DIRS ${THUNDERBIRD_XPCOM_LIBRARY_DIRS}" )
-MESSAGE ( STATUS "    THUNDERBIRD_XPCOM_LIBRARIES ${THUNDERBIRD_XPCOM_LIBRARIES}" )
-
-# Those are the include directories we actually need
-SET ( XPCOM_INCLUDE_DIRS 
-       ${NSPR_MAIN_INCLUDE_DIR}
-       ${THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR}
-       ${THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR}/addrbook
-       ${THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR}/extensions
-       ${THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR}/rdf
-       ${THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR}/string
-       ${THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR}/xpcom_obsolete
-       ${THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR}/xpcom
-       ${THUNDERBIRD_XPCOM_MAIN_INCLUDE_DIR}/xulapp
-)
-
-
-# ----------------------------------------
-
-# Now look for a Subird package
-PKG_SEARCH_MODULE ( SUNBIRD sunbird-xpcom iceowl-xpcom  )
-
-IF ( SUNBIRD_FOUND )
-
-       # If we found the Thunderbird package, let us try to find the main include dir
-       MESSAGE ( "  SUNBIRD_INCLUDE_DIRS ${SUNBIRD_INCLUDE_DIRS}" )
-       # ---------- We just need the first directory, which should be the main directory
-       # The rest will point to xpcom and friends; and we do not want that.
-       # But, let's also handle the special case of only one direcory reported, just in case
-       STRING ( REGEX MATCH ";" _SEVERAL_INCLUDE_DIRS "${SUNBIRD_INCLUDE_DIRS}" )
-       IF ( _SEVERAL_INCLUDE_DIRS )
-               MESSAGE ( "SEVERAL")
-               STRING ( REGEX REPLACE "([^;]*);.*" "\\1" SUNBIRD_MAIN_INCLUDE_DIR "${SUNBIRD_INCLUDE_DIRS}" )
-       ELSE ( _SEVERAL_INCLUDE_DIRS )
-               SET ( SUNBIRD_MAIN_INCLUDE_DIR "${SUNBIRD_INCLUDE_DIRS}" )
-       ENDIF ( _SEVERAL_INCLUDE_DIRS )
-
-ELSE( SUNBIRD_FOUND )
-
-       # We did not find a Sunbird package, so let us look for the files manually 
-       MESSAGE ( STATUS "  did not find sunbird package; now looking for sunbird files" )
-       FIND_PATH ( SUNBIRD_MAIN_INCLUDE_DIR calbase/calIICSService.h
-               PATH_SUFFIXES sunbird iceowl
-               PATHS
-               /opt/local/include/
-               /sw/include/
-               /usr/local/include/
-               /usr/include/
-       )
-       IF ( NOT SUNBIRD_MAIN_INCLUDE_DIR )
-               MESSAGE ( FATAL_ERROR "*** *** Did not find Sunbird include directory with mozilla-config.h" )
-       ENDIF ( NOT SUNBIRD_MAIN_INCLUDE_DIR )
-
-       # We need the Sunbird version number
-       EXEC_PROGRAM ( sunbird ARGS "--version"
-               OUTPUT_VARIABLE SUNBIRD_VERSION
-               RETURN_VALUE _SUNBIRD_VERSION_RET )
-       IF ( _SUNBIRD_VERSION_RET )
-
-       EXEC_PROGRAM ( iceowl ARGS "--version"
-               OUTPUT_VARIABLE SUNBIRD_VERSION
-               RETURN_VALUE _SUNBIRD_VERSION_RET )
-       ENDIF ( _SUNBIRD_VERSION_RET )
-
-       IF ( WIN32 AND _SUNBIRD_VERSION_RET )
-               GET_FILENAME_COMPONENT ( _sb_exe "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\sunbird.exe]" ABSOLUTE CACHE)
-               EXEC_PROGRAM ( "${_sb_exe}" ARGS "--version"
-                       OUTPUT_VARIABLE SUNBIRD_VERSION
-                       RETURN_VALUE _SUNBIRD_VERSION_RET )
-       ENDIF ( WIN32 AND _SUNBIRD_VERSION_RET )
-
-       IF ( _SUNBIRD_VERSION_RET )
-               MESSAGE ( FATAL_ERROR "*** *** Unable execute sunbird/iceowl to get its version" )
-       ENDIF ( _SUNBIRD_VERSION_RET )
-
-       STRING ( REGEX MATCH ".* ([0-9]\\.[0-9]).*" _SUNBIRD_VERSION_OK "${SUNBIRD_VERSION}" )
-       IF ( _SUNBIRD_VERSION_OK )
-               STRING (REGEX REPLACE ".* ([0-9]\\.[0-9]).*" "\\1" SUNBIRD_VERSION "${SUNBIRD_VERSION}" )
-       ENDIF ( _SUNBIRD_VERSION_OK )
-
-ENDIF ( SUNBIRD_FOUND )
-
-STRING ( REGEX MATCH ".*([0-9]\\.[0-9]).*" _SUNBIRD_VERSION_OK "${SUNBIRD_VERSION}" )
-IF ( _SUNBIRD_VERSION_OK )
-       # Sunbird main version
-       STRING (REGEX REPLACE "^([0-9]+)\\..*$" "\\1" SUNBIRD_VERSION_MAIN "${SUNBIRD_VERSION}" )
-ELSE ( _SUNBIRD_VERSION_OK )
-       MESSAGE ( FATAL_ERROR "*** ***Unable to interpret Sunbird version [${_SUNBIRD_VERSION}]" )
-ENDIF ( _SUNBIRD_VERSION_OK )
-
-
-
-# ----------------------------------------
-
-# So, by now we should have the following variables set:
-MESSAGE ( STATUS "     SUNBIRD_MAIN_INCLUDE_DIR ${SUNBIRD_MAIN_INCLUDE_DIR}" )
-MESSAGE ( STATUS "     SUNBIRD_VERSION ${SUNBIRD_VERSION}" )
-
-# Set the final output variables
-SET ( XPCOM_INCLUDE_DIRS "${XPCOM_INCLUDE_DIRS};${SUNBIRD_MAIN_INCLUDE_DIR}" )
-SET ( XPCOM_LIBRARY_DIRS "${THUNDERBIRD_XPCOM_LIBRARY_DIRS}" )
-SET ( XPCOM_LIBRARIES "${THUNDERBIRD_XPCOM_LIBRARIES}" )
-
-# And here is what we found out:
-MESSAGE ( STATUS "Found xpcom (thunderbird and sunbird):" )
-MESSAGE ( STATUS "  THUNDERBIRD_XPCOM_VERSION=[${THUNDERBIRD_XPCOM_VERSION}]" )
-MESSAGE ( STATUS "  SUNBIRD_VERSION=[${SUNBIRD_VERSION}]" )
-MESSAGE ( STATUS "  THUNDERBIRD_VERSION_MAIN=[${THUNDERBIRD_VERSION_MAIN}]" )
-MESSAGE ( STATUS "  SUNBIRD_VERSION_MAIN=[${SUNBIRD_VERSION_MAIN}]" )
-MESSAGE ( STATUS "  XPCOM_INCLUDE_DIRS ${XPCOM_INCLUDE_DIRS}" )
-MESSAGE ( STATUS "  XPCOM_LIBRARY_DIRS ${XPCOM_LIBRARY_DIRS}" )
-MESSAGE ( STATUS "  XPCOM_LIBRARIES ${XPCOM_LIBRARIES}" )
-MESSAGE ( STATUS "  SUNBIRD_VERSION ${SUNBIRD_VERSION}" )
diff --git a/cmake/modules/Testing.cmake b/cmake/modules/Testing.cmake
deleted file mode 100644 (file)
index f65d8e3..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-ENABLE_TESTING()
-INCLUDE( CTest )
-
-IF ( CMAKE_COMPILER_IS_GNUCC )
-       SET( CMAKE_C_FLAGS_PROFILING "-g -O0 -Wall -W -Wshadow -Wunused-variable -Wunused-parameter -Wunused-function -Wunused -Wno-system-headers -Wwrite-strings -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Compiler Flags" ) 
-       # SET( CMAKE_C_FLAGS_PROFILING "-g -O0 -Wall -W -Wextra -Wshadow -Wunused-variable -Wunused-parameter -Wunused-function -Wunused -Wno-system-headers -Wwrite-strings -pedantic -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Compiler Flags" )
-       SET( CMAKE_CXX_FLAGS_PROFILING "-g -O0 -Wall -W -Wshadow -Wunused-variable -Wunused-parameter -Wunused-function -Wunused -Wno-system-headers -Wwrite-strings -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Compiler Flags" ) 
-       SET( CMAKE_SHARED_LINKER_FLAGS_PROFILING " -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Linker Flags" )
-       SET( CMAKE_MODULE_LINKER_FLAGS_PROFILING " -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Linker Flags" )
-       SET( CMAKE_EXEC_LINKER_FLAGS_PROFILING " -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Linker Flags" )
-ENDIF ( CMAKE_COMPILER_IS_GNUCC )
-
-MACRO( BUILD_CHECK_TEST _testName _testSource ) 
-
-       if(COMMAND cmake_policy)
-               cmake_policy(SET CMP0003 NEW)
-               ## The macro ADD_CHECK_TEST creates false warning.
-               cmake_policy(SET CMP0002 OLD)
-       endif(COMMAND cmake_policy)
-       ADD_EXECUTABLE( ${_testName} ${_testSource} )
-       TARGET_LINK_LIBRARIES( ${_testName} ${ARGN} )
-
-ENDMACRO( BUILD_CHECK_TEST )
-
-MACRO( ADD_CHECK_TEST _testName _testSource ) 
-
-       if(COMMAND cmake_policy)
-               cmake_policy(SET CMP0003 NEW)
-               ## The macro ADD_CHECK_TEST creates false warning.
-               cmake_policy(SET CMP0002 OLD)
-       endif(COMMAND cmake_policy)
-       BUILD_CHECK_TEST( ${_testName} ${_testSource} ${ARGN} )
-       #       ADD_EXECUTABLE( ${_testName} ${_testSource} )
-       #       TARGET_LINK_LIBRARIES( ${_testName} ${ARGN} )
-       ADD_TEST( ${_testName} ${CMAKE_CURRENT_BINARY_DIR}/${_testName} )
-
-ENDMACRO( ADD_CHECK_TEST )
-
-MACRO( OSYNC_TESTCASE _testSource _testDest ) 
-
-       if(COMMAND cmake_policy)
-               cmake_policy(SET CMP0003 NEW)
-               ## The macro ADD_CHECK_TEST creates false warning.
-               cmake_policy(SET CMP0002 OLD)
-       endif(COMMAND cmake_policy)
-
-       # 1st Argument is the testcase name
-       # 2nd Argument is the executable name
-        # 3rd Argument the testcase name, again, as argument for the executable
-       ADD_TEST( ${_testDest} ${_testSource} ${_testDest} )
-
-ENDMACRO( OSYNC_TESTCASE )
-
-
-MACRO( OSYNC_TESTCASE_DISABLED _testSource _testDest _ticket ) 
-
-       OSYNC_TESTCASE( ${_testSource} ${_testDest} ) 
-       SET( CTEST_CUSTOM_TESTS_IGNORE ${CTEST_CUSTOM_TESTS_IGNORE} "${_testDest}" )
-
-       MESSAGE( STATUS "Testcase \"${_testDest}\" disabled/ignored! ${TICKETURL}${_ticket}" )
-
-ENDMACRO( OSYNC_TESTCASE_DISABLED )
-
index a38ae8598efd446d27e344f74640d62612a0b603..e5b8d7619ce4a40262a714e951024aa956e611e9 100644 (file)
@@ -373,7 +373,7 @@ WBXML_DECLARE(WB_BOOL) wbxml_buffer_strip_blanks(WBXMLBuffer *buffer)
 
 WBXML_DECLARE(void) wbxml_buffer_no_spaces(WBXMLBuffer *buffer)
 {
-    WB_ULONG i = 0, j = 0, end = 0;
+    WB_ULONG i = 0;
     WB_UTINY ch = 0;
     
     if ((buffer == NULL) || buffer->is_static)
index 8f06a5ecde0ac3c45c78f5327910511e55d40b3e..3eed5471cbe3cc49c96191f9d633ea6e1450ac8e 100644 (file)
@@ -111,7 +111,8 @@ static const WBXMLErrorCodeItem error_table [] = {
     { WBXML_ERROR_CHARSET_UNKNOWN,              "The character set is unknown."},
     { WBXML_ERROR_CHARSET_CONV_INIT,            "The converter for the character set cannot be initialized."},
     { WBXML_ERROR_CHARSET_CONV,                 "The character conversion failed."},
-    { WBXML_ERROR_CHARSET_NOT_FOUND,            "The character set cannot be found."}
+    { WBXML_ERROR_CHARSET_NOT_FOUND,            "The character set cannot be found."},
+    { WBXML_ERROR_INVALID_UNICODE,              "Invalid Unicode character detected."}
 };
 
 #define ERROR_TABLE_SIZE ((WB_ULONG) (sizeof(error_table) / sizeof(error_table[0])))
index b8421be1b01ec663c7dc18611ae0d0254073e2e6..0f731cb86a3125d0fdf9e5c5637f263b41b43c90 100644 (file)
@@ -111,6 +111,7 @@ typedef enum WBXMLError_e {
 #endif /* WBXML_SUPPORT_WV */
     WBXML_ERROR_NO_XMLPARSER =           120,
     WBXML_ERROR_XMLPARSER_OUTPUT_UTF16 = 121,
+    WBXML_ERROR_INVALID_UNICODE = 122
 } WBXMLError;
 
 
index 882dd22673c2edb71846cc712d08f5e363556901..16e45ebde90db9c2f3e519c5547a6c98bc39ca40 100644 (file)
@@ -48,7 +48,6 @@
 #include "wbxml_internals.h"
 #include "wbxml_base64.h"
 #include "wbxml_charset.h"
-#include <assert.h>
 
 
 /* Memory management related defines */
@@ -1739,7 +1738,11 @@ static WBXMLError parse_entity(WBXMLParser *parser, WBXMLBuffer **result)
      * Convert the UCS-4 code to a UTF-8 encoded string.
      */
 
-    assert(code < 0x80000000);
+    if (code >= 0x80000000)
+    {
+        /* no valid unicode */
+        return WBXML_ERROR_INVALID_UNICODE;
+    }
 
     if (code < 0x80)
     {
@@ -2463,7 +2466,8 @@ static WBXMLError decode_opaque_content(WBXMLParser  *parser,
 
     case WBXML_LANG_DRMREL10:
         /* ds:KeyValue */
-        if ((parser->current_tag->wbxmlCodePage == 0x00) &&
+        if ((parser->current_tag) &&
+            (parser->current_tag->wbxmlCodePage == 0x00) &&
             (parser->current_tag->wbxmlToken == 0x0C))
         {
             /* Decode base64 value */ 
@@ -2552,6 +2556,12 @@ static WBXMLError decode_wv_content(WBXMLParser  *parser, WBXMLBuffer **data)
     WBXMLWVDataType data_type = WBXML_WV_DATA_TYPE_STRING;
     WBXMLError      ret       = WBXML_OK;
 
+    /* Check for valid entry point */
+    if (parser->current_tag == NULL) {
+        /* no content to parse */
+        return WBXML_OK;
+    }
+
     /* Wireless-Village 1.1 / 1.2 */
   
     /* 
@@ -2835,7 +2845,6 @@ static WBXMLError decode_wv_datetime(WBXMLBuffer **data)
               the_hour[3], the_minute[3], the_second[3],
               result[17];
     WB_ULONG the_value = 0;
-    WBXMLError ret = WBXML_OK;
   
     /** @todo Test decode_wv_datetime() ! */
   
@@ -2904,7 +2913,7 @@ static WBXMLError decode_wv_datetime(WBXMLBuffer **data)
 
     /* Set data */
     if (!wbxml_buffer_append_cstr(*data, result)) {
-        ret = WBXML_ERROR_NOT_ENOUGH_MEMORY;
+        return WBXML_ERROR_NOT_ENOUGH_MEMORY;
     }
   
     return WBXML_OK;
index 867d0f48bc611fa889f3b96520c55a992d37ab70..d9b8aae64d486c8b0362614824031ba0b24928f1 100644 (file)
@@ -2,7 +2,8 @@
  * libwbxml, the WBXML Library.
  * Copyright (C) 2002-2008 Aymerick Jehanne <aymerick@jehanne.org>
  * Copyright (C) 2008-2011 Michael Bell <michael.bell@opensync.org>
- * 
+ * Copyright (c) 2022 Open Mobile Platform LLC.
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -2860,7 +2861,9 @@ const WBXMLTagEntry sv_airsync_tag_table[] = {
     { "UserResponse",           0x08, 0x0c }, /* since r1.0 */
     { "Version",                0x08, 0x0d }, /* not defined in r8.0 but in r1.0 */
     { "InstanceId",             0x08, 0x0e }, /* since r8.0? */
-    { "SendResponse",           0x08, 0x12 }, /* since 16.0 */
+    { "ProposedStartTime",      0x08, 0x10 }, /* since v16.1 */
+    { "ProposedEndTime",        0x08, 0x11 }, /* since v16.1 */
+    { "SendResponse",           0x08, 0x12 }, /* since v16.0 */
 
     /* Code Page: Tasks (since v2.5 and r1.0) */
     { "Body",                   0x09, 0x05 }, /* not defined in r8.0 but in r1.0, supported by v2.5, v12.0 and v12.1 */
@@ -2879,9 +2882,8 @@ const WBXMLTagEntry sv_airsync_tag_table[] = {
     { "Recurrence_Until",       0x09, 0x12 }, /* corrected in libwbxml 0.11.0, supported since v2.5, changed in r8.0, r1.0: RecurrenceUntil */
     { "Recurrence_Occurrences", 0x09, 0x13 }, /* corrected in libwbxml 0.11.0, supported since v2.5, changed in r8.0, r1.0: RecurrenceOccurrences */
     { "Recurrence_Interval",    0x09, 0x14 }, /* corrected in libwbxml 0.11.0, supported since v2.5, changed in r8.0, r1.0: RecurrenceInterval */
-    { "Recurrence_DayOfMonth",  0x09, 0x15 }, /* supported since v2.5, changed in r8.0, r1.0: RecurrenceDayOfMonth */
-    { "Recurrence_DayOfWeek",   0x09, 0x16 }, /* corrected in libwbxml 0.11.0, supported since v2.5, changed in r8.0, r1.0: RecurrenceDayOfWeek */
     { "Recurrence_DayOfMonth",  0x09, 0x15 }, /* corrected in libwbxml 0.11.0, supported since v2.5, changed in r8.0, r1.0: RecurrenceDayOfMonth */
+    { "Recurrence_DayOfWeek",   0x09, 0x16 }, /* corrected in libwbxml 0.11.0, supported since v2.5, changed in r8.0, r1.0: RecurrenceDayOfWeek */
     { "Recurrence_WeekOfMonth", 0x09, 0x17 }, /* corrected in libwbxml 0.11.0, supported since v2.5, changed in r8.0, r1.0: RecurrenceWeekOfMonth */
     { "Recurrence_MonthOfYear", 0x09, 0x18 }, /* corrected in libwbxml 0.11.0, supported since v2.5, changed in r8.0, r1.0: RecurrenceMonthOfYear */
     { "Recurrence_Regenerate",  0x09, 0x19 }, /* corrected in libwbxml 0.11.0, supported since v2.5, changed in r8.0, r1.0: RecurrenceRegenerate */
@@ -3013,6 +3015,7 @@ const WBXMLTagEntry sv_airsync_tag_table[] = {
     { "ApplicationName",                          0x0e, 0x38 }, /* supported by v2.0 and v2.5 */
     { "ApprovedApplicationList",                  0x0e, 0x39 }, /* supported by v2.0 and v2.5 */
     { "Hash",                                     0x0e, 0x3a }, /* supported by v2.0 and v2.5 */
+    { "AccountOnlyRemoteWipe",                    0x0e, 0x3b }, /* supported since v16.1 */
 
     /* Code Page: Search (since v2.5 and r1.0) */
     /* Token 0x06 and 0x16 are not supported. */
@@ -3250,6 +3253,31 @@ const WBXMLTagEntry sv_airsync_tag_table[] = {
     { "ContentOwner",           0x18, 0x17 }, /* since r8.0? */
     { "RemoveRightsManagementDistribution",0x18, 0x18 }, /* since r8.0? */
 
+    /* Code Page: Find (since r18.0) */
+    /* r18.0 - r22.2: not supported when the MS-ASProtocolVersion header is set to 16.0 or lower */
+    { "Find"                   ,0x19, 0x05 }, /* since r18.0 */
+    { "SearchId"               ,0x19, 0x06 }, /* since r18.0 */
+    { "ExecuteSearch"          ,0x19, 0x07 }, /* since r18.0 */
+    { "MailBoxSearchCriterion" ,0x19, 0x08 }, /* since r18.0 */
+    { "Query"                  ,0x19, 0x09 }, /* since r18.0 */
+    { "Status"                 ,0x19, 0x0a }, /* since r18.0 */
+    { "FreeText"               ,0x19, 0x0b }, /* since r18.0 */
+    { "Options"                ,0x19, 0x0c }, /* since r18.0 */
+    { "Range"                  ,0x19, 0x0d }, /* since r18.0 */
+    { "DeepTraversal"          ,0x19, 0x0e }, /* since r18.0 */
+    { "Response"               ,0x19, 0x11 }, /* since r18.0 */
+    { "Result"                 ,0x19, 0x12 }, /* since r18.0 */
+    { "Properties"             ,0x19, 0x13 }, /* since r18.0 */
+    { "Preview"                ,0x19, 0x14 }, /* since r18.0 */
+    { "HasAttachments"         ,0x19, 0x15 }, /* since r18.0 */
+    { "Total"                  ,0x19, 0x16 }, /* since r18.0 */
+    { "DisplayCc"              ,0x19, 0x17 }, /* since r18.0 */
+    { "DisplayBcc"             ,0x19, 0x18 }, /* since r18.0 */
+    { "GalSearchCriterion"     ,0x19, 0x19 }, /* since r20.0 */
+    { "MaxPictures"            ,0x19, 0x20 }, /* since r22.1 */
+    { "MaxSize"                ,0x19, 0x21 }, /* since r22.1 */
+    { "Picture"                ,0x19, 0x22 }, /* since r22.2 */
+
     { NULL,                  0x00, 0x00 }
 };
 
@@ -3291,6 +3319,7 @@ const WBXMLAttrEntry sv_airsync_attr_table[] = {
  *   Email2:              http://synce.org/formats/airsync_wm5/email2
  *   Notes:               http://synce.org/formats/airsync_wm5/notes
  *   RightsManagement:    http://synce.org/formats/airsync_wm5/rightsmanagement
+ *   Find:                http://synce.org/formats/airsync_wm5/find
  *
  */
 const WBXMLNameSpaceEntry sv_airsync_ns_table[] = {
@@ -3319,6 +3348,7 @@ const WBXMLNameSpaceEntry sv_airsync_ns_table[] = {
     { "http://synce.org/formats/airsync_wm5/email2",            0x16 },     /**< Code Page 22 */
     { "http://synce.org/formats/airsync_wm5/notes",             0x17 },     /**< Code Page 23 */
     { "http://synce.org/formats/airsync_wm5/rightsmanagement",  0x18 },     /**< Code Page 24 */
+    { "http://synce.org/formats/airsync_wm5/find",              0x19 },     /**< Code Page 25 */
     { NULL,                                                     0x00 }
 };
 
@@ -3348,6 +3378,7 @@ const WBXMLNameSpaceEntry sv_activesync_ns_table[] = {
     { "Email2:",            0x16 },     /**< Code Page 22 */
     { "Notes:",             0x17 },     /**< Code Page 23 */
     { "RightsManagement:",  0x18 },     /**< Code Page 24 */
+    { "Find:",              0x19 },     /**< Code Page 25 */
     { NULL,                 0x00 }
 };
 
index f1d9de8a2cf0f8734214cc008d4177b62d4bb3d6..991cf33bd88c6435092d61c4091599f328950102 100644 (file)
@@ -53,7 +53,9 @@ WBXML_DECLARE(WBXMLError) wbxml_tree_from_wbxml(WB_UTINY *wbxml,
                                                 WBXMLTree **tree)
 {
     WBXMLParser *wbxml_parser = NULL;
-    WB_LONG error_index = 0;
+#if defined( WBXML_LIB_VERBOSE )
+    WB_LONG error_index;
+#endif
     WBXMLTreeClbCtx wbxml_tree_clb_ctx;
     WBXMLError ret = WBXML_OK;
     WBXMLContentHandler wbxml_tree_content_handler = 
@@ -100,11 +102,13 @@ WBXML_DECLARE(WBXMLError) wbxml_tree_from_wbxml(WB_UTINY *wbxml,
     ret = wbxml_parser_parse(wbxml_parser, wbxml, wbxml_len);
     if ((ret != WBXML_OK) || (wbxml_tree_clb_ctx.error != WBXML_OK)) 
     {
+#if defined( WBXML_LIB_VERBOSE )
         error_index = wbxml_parser_get_current_byte_index(wbxml_parser);
         WBXML_ERROR((WBXML_PARSER, "WBXML Parser failed at %ld - token: %x (%s)", 
                                    error_index,
                                    wbxml[error_index],
                                    ret != WBXML_OK ? wbxml_errors_string(ret) : wbxml_errors_string(wbxml_tree_clb_ctx.error)));
+#endif
         
         wbxml_tree_destroy(wbxml_tree_clb_ctx.tree);
     }
index ca61edef829c396ed302380c2a53a75009aeff3c..0d4fb2dc3028cf5a3f69fe7757858f03475d3b06 100644 (file)
@@ -43,7 +43,6 @@
 #include "wbxml_log.h"
 #include "wbxml_charset.h"
 #include "wbxml_base64.h"
-#include <assert.h>
 
 /************************************
  *  Public Functions
@@ -318,7 +317,6 @@ void wbxml_tree_clb_xml_end_element(void           *ctx,
                                return;
                }
 
-               assert (lang!= NULL);
                if (lang == NULL) {
                        tree_ctx->error = WBXML_ERROR_UNKNOWN_XML_LANGUAGE;
                        wbxml_buffer_destroy(embed_doc);
index d3451d772f3dd893ed882c54466a3cc411353425..6d4d7b8ba53d9405b675ea2e31c16e2959bd4089 100644 (file)
@@ -4,7 +4,8 @@ if(COMMAND cmake_policy)
 endif(COMMAND cmake_policy)
 
 ENABLE_TESTING()
-FIND_PACKAGE(Check REQUIRED)
+FIND_PACKAGE( PkgConfig REQUIRED)
+PKG_CHECK_MODULES( CHECK REQUIRED check )
 
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CHECK_INCLUDE_DIRS} )
 
index 9ebe385fb133b3d9c783ea445b031c1e0031475a..442861bd8e5c9b70a012fbc6bb659ee8e26718c8 100644 (file)
@@ -6,7 +6,6 @@ START_TEST (security_test_xml_build_result_null_params)
 {
     WBXMLEncoder *enc = NULL;
     WB_UTINY *xml = NULL;
-    WB_ULONG len = 0;
 
     enc = wbxml_encoder_create();
 
diff --git a/test/fuzz/CMakeLists.txt b/test/fuzz/CMakeLists.txt
new file mode 100644 (file)
index 0000000..fc574dd
--- /dev/null
@@ -0,0 +1,19 @@
+
+ENABLE_TESTING()
+
+# Please note, the provided test files originally caused system level crashs.
+SET( FUZZ_FILES
+    SIGABRT.PC.fffff7db0a10.STACK.0.CODE.-6.ADDR.0.INSTR.cmn_w0_0x1_lsl_12.2024-03-07.035819.705486.fuzz
+    SIGSEGV.PC.aaaaaaae3998.STACK.0.CODE.1.ADDR.8.INSTR.ldrb_w8_x8_8.2024-03-07.035825.707512.fuzz
+    SIGSEGV.PC.aaaaaaae39ac.STACK.0.CODE.1.ADDR.8.INSTR.ldrb_w20_x21_8.2024-03-11.003303.27182.fuzz
+   )
+SET( WBXML2XML "${CMAKE_CURRENT_BINARY_DIR}/../../tools/wbxml2xml" )
+
+FOREACH( FUZZ_FILE IN LISTS FUZZ_FILES )
+    SET( TEST_NAME "Fuzz_file_${FUZZ_FILE}" )
+    ADD_TEST( NAME ${TEST_NAME} COMMAND ${WBXML2XML} "${CMAKE_CURRENT_SOURCE_DIR}/${FUZZ_FILE}" )
+    # Please note, a system level crash like SIGABRT or SIGSEGV would cause this test to fail.
+    # The regular expression ensures that the library returned a proper error.
+    SET_PROPERTY( TEST ${TEST_NAME} PROPERTY WILL_FAIL TRUE)
+    SET_PROPERTY( TEST ${TEST_NAME} PROPERTY FAIL_REGULAR_EXPRESSION "wbxml2xml failed: ")
+ENDFOREACH()
diff --git a/test/fuzz/SIGABRT.PC.fffff7db0a10.STACK.0.CODE.-6.ADDR.0.INSTR.cmn_w0_0x1_lsl_12.2024-03-07.035819.705486.fuzz b/test/fuzz/SIGABRT.PC.fffff7db0a10.STACK.0.CODE.-6.ADDR.0.INSTR.cmn_w0_0x1_lsl_12.2024-03-07.035819.705486.fuzz
new file mode 100644 (file)
index 0000000..5e59f68
Binary files /dev/null and b/test/fuzz/SIGABRT.PC.fffff7db0a10.STACK.0.CODE.-6.ADDR.0.INSTR.cmn_w0_0x1_lsl_12.2024-03-07.035819.705486.fuzz differ
diff --git a/test/fuzz/SIGSEGV.PC.aaaaaaae3998.STACK.0.CODE.1.ADDR.8.INSTR.ldrb_w8_x8_8.2024-03-07.035825.707512.fuzz b/test/fuzz/SIGSEGV.PC.aaaaaaae3998.STACK.0.CODE.1.ADDR.8.INSTR.ldrb_w8_x8_8.2024-03-07.035825.707512.fuzz
new file mode 100644 (file)
index 0000000..791f565
Binary files /dev/null and b/test/fuzz/SIGSEGV.PC.aaaaaaae3998.STACK.0.CODE.1.ADDR.8.INSTR.ldrb_w8_x8_8.2024-03-07.035825.707512.fuzz differ
diff --git a/test/fuzz/SIGSEGV.PC.aaaaaaae39ac.STACK.0.CODE.1.ADDR.8.INSTR.ldrb_w20_x21_8.2024-03-11.003303.27182.fuzz b/test/fuzz/SIGSEGV.PC.aaaaaaae39ac.STACK.0.CODE.1.ADDR.8.INSTR.ldrb_w20_x21_8.2024-03-11.003303.27182.fuzz
new file mode 100644 (file)
index 0000000..894cc1d
Binary files /dev/null and b/test/fuzz/SIGSEGV.PC.aaaaaaae39ac.STACK.0.CODE.1.ADDR.8.INSTR.ldrb_w20_x21_8.2024-03-11.003303.27182.fuzz differ
index 5757dd4314056ceea8b517c3a6eb82c54cf22baf..40cf56b72d60c396b8fca283f0de89ada845cbc2 100755 (executable)
@@ -172,7 +172,9 @@ do
        echo CDATA_ENCAPSULATION
     else
        $PERL_BIN $NORMALIZE_SCRIPT --delete-attribute xmlns $j $OUT_XML.org
+       if [ $? != 0 ]; then echo FAILED; RESULT="FAILED"; continue; fi
        $PERL_BIN $NORMALIZE_SCRIPT --delete-attribute xmlns $OUT_XML $OUT_XML.new
+       if [ $? != 0 ]; then echo FAILED; RESULT="FAILED"; continue; fi
        DIFF_RESULT=`$DIFF_BIN -b $OUT_XML.org $OUT_XML.new`
        if [ " $DIFF_RESULT" != " " ];
        then
index ae860ec44952de458bb08f6bc8463381ba355595..501bd9971dd532b06f715633d81d8725efb5177a 100644 (file)
@@ -318,7 +318,7 @@ WB_LONG main(WB_LONG argc, WB_TINY **argv)
     FILE *input_file = NULL, *output_file = NULL;
     WB_LONG count = 0, wbxml_len = 0, total = 0;
     WB_ULONG xml_len = 0;
-    WB_TINY opt;
+    int opt;
     WBXMLError ret = WBXML_OK;
     WB_UTINY input_buffer[INPUT_BUFFER_SIZE + 1];
     WBXMLConvWBXML2XML *conv = NULL;
@@ -330,7 +330,7 @@ WB_LONG main(WB_LONG argc, WB_TINY **argv)
         goto clean_up;
     }
 
-    while ((opt = (WB_TINY) wbxml_getopt(argc, argv, "kh?o:m:i:l:c:")) != EOF)
+    while ((opt = wbxml_getopt(argc, argv, "kh?o:m:i:l:c:")) != EOF)
     {
         switch (opt) {
         case 'k':
index 01f5a598d53868522e2b2fafc045845b43cc4584..8992e4517d5145a4fa0b4458e080fb7efa62db5a 100644 (file)
@@ -111,7 +111,7 @@ WB_LONG main(WB_LONG argc, WB_TINY **argv)
     FILE *input_file = NULL, *output_file = NULL;
     WB_ULONG wbxml_len = 0;
     WB_LONG count = 0, xml_len = 0, total = 0;
-    WB_TINY opt;
+    int opt;
     WBXMLError ret = WBXML_OK;
     WB_UTINY input_buffer[INPUT_BUFFER_SIZE + 1];
     WBXMLConvXML2WBXML *conv = NULL;
@@ -124,7 +124,7 @@ WB_LONG main(WB_LONG argc, WB_TINY **argv)
     }
 
 
-    while ((opt = (WB_TINY) wbxml_getopt(argc, argv, "nkah?o:v:")) != EOF)
+    while ((opt = wbxml_getopt(argc, argv, "nkah?o:v:")) != EOF)
     {
         switch (opt) {
         case 'v':