Changeset 2892

Timestamp:

12/02/07 01:32:55 (1 year ago)

Author:

prahal

Message:

SEND_ERROR was fine, no need for FATAL_ERROR (thus no need for the
check after pkg_search_module *AS* we check PKG_CONFIG_FOUND before
using the fallback).

Files:

• branches/3rd-party-cmake-modules/modules/FindBONOBO2.cmake (modified) (3 diffs)
• branches/3rd-party-cmake-modules/modules/FindBONOBOACTIVATION2.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindBlueZ.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindEBook1.0.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindEBook1.2.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindECal1.0.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindECal1.2.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindEDataBook1.0.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindEDataBook1.2.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindEDataCal1.0.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindEDataCal1.2.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindEDataServer1.0.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindEDataServer1.2.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindEvolutionDataServer1.0.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindEvolutionDataServer1.2.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindGConf2.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindGNUTLS.cmake (modified) (1 diff)
• branches/3rd-party-cmake-modules/modules/FindGnomeVfs2.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindLibGnome2.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindLibSoup2.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindLibSyncMl.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindLibWbxml2.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindORBit2.cmake (modified) (2 diffs)
• branches/3rd-party-cmake-modules/modules/FindOpenObex.cmake (modified) (2 diffs)

branches/3rd-party-cmake-modules/modules/FindBONOBO2.cmake

@@ -19 +19 @@
-
-
-
-
-
-
-INCLUDE( FindPkgConfig )
-# Take care about libbonobo-2.0.pc settings
@@ -33 +29 @@
-IF ( BONOBO2_MIN_VERSION )
-        pkg_search_module( BONOBO2 ${_pkgconfig_REQUIRED} libbonobo-2.0>=${BONOBO2_MIN_VERSION} )
-        SET (_pkgconfig_version ">=${BONOBO2_MIN_VERSION}")
-ELSE ( BONOBO2_MIN_VERSION )
-        pkg_search_module( BONOBO2 ${_pkgconfig_REQUIRED} libbonobo-2.0 )
-        SET (_pkgconfig_version "")
-ENDIF ( BONOBO2_MIN_VERSION )
-
-IF ( NOT BONOBO2_FOUND AND PKG_CONFIG_FOUND )
-        IF ( BONOBO2_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find bonobo2${_pkgconfig_version}" )
-        ELSE ( BONOBO2_FIND_REQUIRED )
-                IF ( NOT BONOBO2_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find bonobo2${_pkgconfig_version}" )     
-                ENDIF ( NOT BONOBO2_FIND_QUIETLY )
-        ENDIF ( BONOBO2_FIND_REQUIRED )
-ENDIF ( NOT BONOBO2_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -117 +101 @@
-        ELSE ( BONOBO2_LIBRARIES AND BONOBO2_INCLUDE_DIRS AND _bonobo2_FOUND )  
-                IF ( BONOBO2_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( BONOBO2_FIND_REQUIRED )
-                        IF ( NOT BONOBO2_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT BONOBO2_FIND_QUIETLY )
-                ENDIF ( BONOBO2_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindBONOBOACTIVATION2.cmake

@@ -33 +33 @@
-IF ( BONOBOACTIVATION2_MIN_VERSION )
-        pkg_search_module( BONOBOACTIVATION2 ${_pkgconfig_REQUIRED} bonobo-activation-2.0>=${BONOBOACTIVATION2_MIN_VERSION} )
-        SET (_pkgconfig_version ">=${BONOBOACTIVATION2_MIN_VERSION}")
-ELSE ( BONOBOACTIVATION2_MIN_VERSION )
-        pkg_search_module( BONOBOACTIVATION2 ${_pkgconfig_REQUIRED} bonobo-activation-2.0 )
-        SET (_pkgconfig_version "")
-ENDIF ( BONOBOACTIVATION2_MIN_VERSION )
-
-IF ( NOT BONOBOACTIVATION2_FOUND AND PKG_CONFIG_FOUND )
-        IF ( BONOBOACTIVATION2_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find bonobo-activation2${_pkgconfig_version}" )
-        ELSE ( BONOBOACTIVATION2_FIND_REQUIRED )
-                IF ( NOT BONOBOACTIVATION2_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find bonobo-activation2${_pkgconfig_version}" )  
-                ENDIF ( NOT BONOBOACTIVATION2_FIND_QUIETLY )
-        ENDIF ( BONOBOACTIVATION2_FIND_REQUIRED )
-ENDIF ( NOT BONOBOACTIVATION2_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -110 +98 @@
-        ELSE ( BONOBOACTIVATION2_LIBRARIES AND BONOBOACTIVATION2_INCLUDE_DIRS AND _bonoboactivation2_FOUND )    
-                IF ( BONOBOACTIVATION2_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( BONOBOACTIVATION2_FIND_REQUIRED )
-                        IF ( NOT BONOBOACTIVATION2_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT BONOBOACTIVATION2_FIND_QUIETLY )
-                ENDIF ( BONOBOACTIVATION2_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindBlueZ.cmake

@@ -24 +24 @@
-
-IF ( BLUEZ_MIN_VERSION )
-
-
+
-ELSE ( BLUEZ_MIN_VERSION )
-
-
+
-ENDIF ( BLUEZ_MIN_VERSION )
-
-IF ( NOT BLUEZ_FOUND AND PKG_CONFIG_FOUND )
-        IF ( BlueZ_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find BlueZ${_pkgconfig_version}" )
-        ELSE ( BlueZ_FIND_REQUIRED )
-                IF ( NOT BlueZ_FIND_QUIETLY )
-                        MESSAGE( STATUS "Could NOT find BlueZ${_pkgconfig_version}" )   
-                ENDIF ( NOT BlueZ_FIND_QUIETLY )
-        ENDIF ( BlueZ_FIND_REQUIRED )
-ENDIF ( NOT BLUEZ_FOUND AND PKG_CONFIG_FOUND )
-
-# Look for BlueZ include dir and libraries
@@ -55 +43 @@
-        ELSE ( BLUEZ_LIBRARIES AND BLUEZ_INCLUDE_DIRS ) 
-                IF ( BlueZ_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( BlueZ_FIND_REQUIRED )
-                        IF ( NOT BlueZ_FIND_QUIETLY )

branches/3rd-party-cmake-modules/modules/FindEBook1.0.cmake

@@ -25 +25 @@
-
-pkg_search_module( LIBEBOOK1.0 ${_pkgconfig_REQUIRED} libebook-1.0 )
-
-IF ( NOT LIBEBOOK1.0_FOUND AND PKG_CONFIG_FOUND )
-        IF ( EBook1.0_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libebook-1.0" )
-        ELSE ( EBook1.0_FIND_REQUIRED )
-                IF ( NOT EBook1.0_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libebook-1.0" )     
-                ENDIF ( NOT EBook1.0_FIND_QUIETLY )
-        ENDIF ( EBook1.0_FIND_REQUIRED )
-ENDIF ( NOT LIBEBOOK1.0_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -99 +89 @@
-        ELSE ( LIBEBOOK1.0_LIBRARIES AND LIBEBOOK1.0_INCLUDE_DIRS AND _libebook1.0_FOUND )      
-                IF ( EBook1.0_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( EBook1.0_FIND_REQUIRED )
-                        IF ( NOT EBook1.0_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT EBook1.0_FIND_QUIETLY )
-                ENDIF ( EBook1.0_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindEBook1.2.cmake

@@ -25 +25 @@
-
-pkg_search_module( LIBEBOOK1.2 ${_pkgconfig_REQUIRED} libebook-1.2 )
-
-IF ( NOT LIBEBOOK1.2_FOUND AND PKG_CONFIG_FOUND )
-        IF ( EBook1.2_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libebook-1.2" )
-        ELSE ( EBook1.2_FIND_REQUIRED )
-                IF ( NOT EBook1.2_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libebook-1.2" )
-                ENDIF ( NOT EBook1.2_FIND_QUIETLY )
-        ENDIF ( EBook1.2_FIND_REQUIRED )
-ENDIF ( NOT LIBEBOOK1.2_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -100 +90 @@
-        ELSE ( LIBEBOOK1.2_LIBRARIES AND LIBEBOOK1.2_INCLUDE_DIRS AND _libebook1.2_FOUND )      
-                IF ( EBook1.2_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( EBook1.2_FIND_REQUIRED )
-                        IF ( NOT EBook1.2_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT EBook1.2_FIND_QUIETLY )
-                ENDIF ( EBook1.2_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindECal1.0.cmake

@@ -25 +25 @@
-
-pkg_search_module( LIBECAL1.0 ${_pkgconfig_REQUIRED} libecal-1.0 )
-
-IF ( NOT LIBECAL1.0_FOUND AND PKG_CONFIG_FOUND )
-        IF ( ECal1.0_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libcal-1.0" )
-        ELSE ( ECal1.0_FIND_REQUIRED )
-                IF ( NOT ECal1.0_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libcal-1.0" )
-                ENDIF ( NOT ECal1.0_FIND_QUIETLY )
-        ENDIF ( ECal1.0_FIND_REQUIRED )
-ENDIF ( NOT LIBECAL1.0_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -99 +89 @@
-        ELSE ( LIBECAL1.0_LIBRARIES AND LIBECAL1.0_INCLUDE_DIRS AND _libecal1.0_FOUND ) 
-                IF ( ECal1.0_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( ECal1.0_FIND_REQUIRED )
-                        IF ( NOT ECal1.0_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT ECal1.0_FIND_QUIETLY )
-                ENDIF ( ECal1.0_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindECal1.2.cmake

@@ -25 +25 @@
-
-pkg_search_module( LIBECAL1.2 ${_pkgconfig_REQUIRED} libecal-1.2 )
-
-IF ( NOT LIBECAL1.2_FOUND AND PKG_CONFIG_FOUND )
-        IF ( ECal1.2_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libcal-1.2" )
-        ELSE ( ECal1.2_FIND_REQUIRED )
-                IF ( NOT ECal1.2_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libcal-1.2" )
-                ENDIF ( NOT ECal1.2_FIND_QUIETLY )
-        ENDIF ( ECal1.2_FIND_REQUIRED )
-ENDIF ( NOT LIBECAL1.2_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -100 +90 @@
-        ELSE ( LIBECAL1.2_LIBRARIES AND LIBECAL1.2_INCLUDE_DIRS AND _libecal1.2_FOUND ) 
-                IF ( ECal1.2_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( ECal1.2_FIND_REQUIRED )
-                        IF ( NOT ECal1.2_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT ECal1.2_FIND_QUIETLY )
-                ENDIF ( ECal1.2_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindEDataBook1.0.cmake

@@ -25 +25 @@
-
-pkg_search_module( LIBEDATABOOK1.0 ${_pkgconfig_REQUIRED} libedata-book-1.0 )
-
-IF ( NOT LIBEDATABOOK1.0_FOUND AND PKG_CONFIG_FOUND )
-        IF ( EDataBook1.0_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libedatabook-1.0" )
-        ELSE ( EDataBook1.0_FIND_REQUIRED )
-                IF ( NOT EDataBook1.0_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libedatabook-1.0" )
-                ENDIF ( NOT EDataBook1.0_FIND_QUIETLY )
-        ENDIF ( EDataBook1.0_FIND_REQUIRED )
-ENDIF ( NOT LIBEDATABOOK1.0_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -107 +97 @@
-        ELSE ( LIBEDATABOOK1.0_LIBRARIES AND LIBEDATABOOK1.0_INCLUDE_DIRS AND _libedatabook1.0_FOUND )  
-                IF ( EDataBook1.0_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( EDataBook1.0_FIND_REQUIRED )
-                        IF ( NOT EDataBook1.0_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT EDataBook1.0_FIND_QUIETLY )
-                ENDIF ( EDataBook1.0_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindEDataBook1.2.cmake

@@ -25 +25 @@
-
-pkg_search_module( LIBEDATABOOK1.2 ${_pkgconfig_REQUIRED} libedata-book-1.2 )
-
-IF ( NOT LIBEDATABOOK1.2_FOUND AND PKG_CONFIG_FOUND )
-        IF ( EDataBook1.2_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libedatabook-1.2" )
-        ELSE ( EDataBook1.2_FIND_REQUIRED )
-                IF ( NOT EDataBook1.2_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libedatabook-1.2" )
-                ENDIF ( NOT EDataBook1.2_FIND_QUIETLY )
-        ENDIF ( EDataBook1.2_FIND_REQUIRED )
-ENDIF ( NOT LIBEDATABOOK1.2_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -107 +97 @@
-        ELSE ( LIBEDATABOOK1.2_LIBRARIES AND LIBEDATABOOK1.2_INCLUDE_DIRS AND _libedatabook1.2_FOUND )  
-                IF ( EDataBook1.2_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( EDataBook1.2_FIND_REQUIRED )
-                        IF ( NOT EDataBook1.2_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT EDataBook1.2_FIND_QUIETLY )
-                ENDIF ( EDataBook1.2_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindEDataCal1.0.cmake

@@ -25 +25 @@
-
-pkg_search_module( LIBEDATACAL1.0 ${_pkgconfig_REQUIRED} libedata-cal-1.0 )
-
-IF ( NOT LIBEDATACAL1.0_FOUND AND PKG_CONFIG_FOUND )
-        IF ( EDataCal1.0_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libedatacal-1.0" )
-        ELSE ( EDataCal1.0_FIND_REQUIRED )
-                IF ( NOT EDataCal1.0_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libedatacal-1.0" )
-                ENDIF ( NOT EDataCal1.0_FIND_QUIETLY )
-        ENDIF ( EDataCal1.0_FIND_REQUIRED )
-ENDIF ( NOT LIBEDATACAL1.0_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -114 +104 @@
-        ELSE ( LIBEDATACAL1.0_LIBRARIES AND LIBEDATACAL1.0_INCLUDE_DIRS AND _libedatacal1.0_FOUND )     
-                IF ( EDataCal1.0_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( EDataCal1.0_FIND_REQUIRED )
-                        IF ( NOT EDataCal1.0_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT EDataCal1.0_FIND_QUIETLY )
-                ENDIF ( EDataCal1.0_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindEDataCal1.2.cmake

@@ -25 +25 @@
-
-pkg_search_module( LIBEDATACAL1.2 ${_pkgconfig_REQUIRED} libedata-cal-1.2 )
-
-IF ( NOT LIBEDATACAL1.2_FOUND AND PKG_CONFIG_FOUND )
-        IF ( EDataCal1.2_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libedatacal-1.2" )
-        ELSE ( EDataCal1.2_FIND_REQUIRED )
-                IF ( NOT EDataCal1.2_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libedatacal-1.2" )
-                ENDIF ( NOT EDataCal1.2_FIND_QUIETLY )
-        ENDIF ( EDataCal1.2_FIND_REQUIRED )
-ENDIF ( NOT LIBEDATACAL1.2_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -114 +104 @@
-        ELSE ( LIBEDATACAL1.2_LIBRARIES AND LIBEDATACAL1.2_INCLUDE_DIRS AND _libedatacal1.2_FOUND )     
-                IF ( EDataCal1.2_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( EDataCal1.2_FIND_REQUIRED )
-                        IF ( NOT EDataCal1.2_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT EDataCal1.2_FIND_QUIETLY )
-                ENDIF ( EDataCal1.2_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindEDataServer1.0.cmake

@@ -25 +25 @@
-
-pkg_search_module( LIBEDATASERVER1.0 ${_pkgconfig_REQUIRED} libedataserver-1.0 )
-
-IF ( NOT LIBEDATASERVER1.0_FOUND AND PKG_CONFIG_FOUND )
-        IF ( EDataServer1.0_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libedataserver-1.0" )
-        ELSE ( EDataServer1.0_FIND_REQUIRED )
-                IF ( NOT EDataServer1.0_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libedataserver-1.0" )
-                ENDIF ( NOT EDataServer1.0_FIND_QUIETLY )
-        ENDIF ( EDataServer1.0_FIND_REQUIRED )
-ENDIF ( NOT LIBEDATASERVER1.0_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -116 +106 @@
-        ELSE ( LIBEDATASERVER1.0_LIBRARIES AND LIBEDATASERVER1.0_INCLUDE_DIRS AND _libedataserver1.0_FOUND )    
-                IF ( LibEDataServer1.0_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( LibEDataServer1.0_FIND_REQUIRED )
-                        IF ( NOT LibEDataServer1.0_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT LibEDataServer1.0_FIND_QUIETLY )
-                ENDIF ( LibEDataServer1.0_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindEDataServer1.2.cmake

@@ -25 +25 @@
-
-pkg_search_module( LIBEDATASERVER1.2 ${_pkgconfig_REQUIRED} libedataserver-1.2 )
-
-IF ( NOT LIBEDATASERVER1.2_FOUND AND PKG_CONFIG_FOUND )
-        IF ( EDataServer1.2_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libedataserver-1.2" )
-        ELSE ( EDataServer1.2_FIND_REQUIRED )
-                IF ( NOT EDataServer1.2_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libedataserver-1.2" )
-                ENDIF ( NOT EDataServer1.2_FIND_QUIETLY )
-        ENDIF ( EDataServer1.2_FIND_REQUIRED )
-ENDIF ( NOT LIBEDATASERVER1.2_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -116 +106 @@
-        ELSE ( LIBEDATASERVER1.2_LIBRARIES AND LIBEDATASERVER1.2_INCLUDE_DIRS AND _libedataserver1.2_FOUND )    
-                IF ( LibEDataServer1.2_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( LibEDataServer1.2_FIND_REQUIRED )
-                        IF ( NOT LibEDataServer1.2_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT LibEDataServer1.2_FIND_QUIETLY )
-                ENDIF ( LibEDataServer1.2_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindEvolutionDataServer1.0.cmake

@@ -25 +25 @@
-
-pkg_search_module( EVOLUTIONDATASERVER1.0 ${_pkgconfig_REQUIRED} evolution-data-server-1.0 )
-
-IF ( NOT EVOLUTIONDATASERVER1.0_FOUND AND PKG_CONFIG_FOUND )
-        IF ( EvolutionDataServer1.0_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find evolutiondataserver-1.0" )
-        ELSE ( EvolutionDataServer1.0_FIND_REQUIRED )
-                IF ( NOT EvolutionDataServer1.0_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find evolutiondataserver-1.0" )
-                ENDIF ( NOT EvolutionDataServer1.0_FIND_QUIETLY )
-        ENDIF ( EvolutionDataServer1.0_FIND_REQUIRED )
-ENDIF ( NOT EVOLUTIONDATASERVER1.0_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -64 +54 @@
-        ELSE ( EVOLUTIONDATASERVER1.0_LIBRARIES AND EVOLUTIONDATASERVER1.0_INCLUDE_DIRS )       
-                IF ( EvolutionDataServer1.0_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( EvolutionDataServer1.0_FIND_REQUIRED )
-                        IF ( NOT EvolutionDataServer1.0_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT EvolutionDataServer1.0_FIND_QUIETLY )
-                ENDIF ( EvolutionDataServer1.0_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindEvolutionDataServer1.2.cmake

@@ -25 +25 @@
-
-pkg_search_module( EVOLUTIONDATASERVER1.2 ${_pkgconfig_REQUIRED} evolution-data-server-1.2 )
-
-IF ( NOT EVOLUTIONDATASERVER1.2_FOUND AND PKG_CONFIG_FOUND )
-        IF ( EvolutionDataServer1.2_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find evolutiondataserver-1.2" )
-        ELSE ( EvolutionDataServer1.2_FIND_REQUIRED )
-                IF ( NOT EvolutionDataServer1.2_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find evolutiondataserver-1.2" )
-                ENDIF ( NOT EvolutionDataServer1.2_FIND_QUIETLY )
-        ENDIF ( EvolutionDataServer1.2_FIND_REQUIRED )
-ENDIF ( NOT EVOLUTIONDATASERVER1.2_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -64 +54 @@
-        ELSE ( EVOLUTIONDATASERVER1.2_LIBRARIES AND EVOLUTIONDATASERVER1.2_INCLUDE_DIRS )       
-                IF ( EvolutionDataServer1.2_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( EvolutionDataServer1.2_FIND_REQUIRED )
-                        IF ( NOT EvolutionDataServer1.2_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT EvolutionDataServer1.2_FIND_QUIETLY )
-                ENDIF ( EvolutionDataServer1.2_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindGConf2.cmake

@@ -25 +25 @@
-
-pkg_search_module( GCONF2 ${_pkgconfig_REQUIRED} gconf-2.0 )
-
-IF ( NOT GCONF2_FOUND AND PKG_CONFIG_FOUND )
-        IF ( GConf2_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find gconf2" )
-        ELSE ( GConf2_FIND_REQUIRED )
-                IF ( NOT GConf2_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find gconf2" )   
-                ENDIF ( NOT GConf2_FIND_QUIETLY )
-        ENDIF ( GConf2_FIND_REQUIRED )
-ENDIF ( NOT GCONF2_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -83 +73 @@
-        ELSE ( GCONF2_LIBRARIES AND GCONF2_INCLUDE_DIRS AND _gconf2_FOUND )     
-                IF ( GConf2_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( GConf2_FIND_REQUIRED )
-                        IF ( NOT GConf2_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT GConf2_FIND_QUIETLY )
-                ENDIF ( GConf2_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindGNUTLS.cmake

@@ -22 +22 @@
-
-IF ( GNUTLS_MIN_VERSION )
-
-
+
-ELSE ( GNUTLS_MIN_VERSION )
-
-
+
-ENDIF ( GNUTLS_MIN_VERSION )
-
-IF ( NOT GNUTLS_FOUND AND PKG_CONFIG_FOUND )
-        IF ( GNUTLS_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find gnutls${_pkgconfig_version}" )
-        ELSE ( GNUTLS_FIND_REQUIRED )
-                IF ( NOT GNUTLS_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find gnutls${_pkgconfig_version}" )      
-                ENDIF ( NOT GNUTLS_FIND_QUIETLY )
-        ENDIF ( GNUTLS_FIND_REQUIRED )
-ENDIF ( NOT GNUTLS_FOUND AND PKG_CONFIG_FOUND )
-
-IF( NOT GNUTLS_FOUND AND NOT PKG_CONFIG_FOUND )

branches/3rd-party-cmake-modules/modules/FindGnomeVfs2.cmake

@@ -25 +25 @@
-
-pkg_search_module( GNOMEVFS2 ${_pkgconfig_REQUIRED} gnome-vfs-2.0 )
-
-IF ( NOT GNOMEVFS2_FOUND AND PKG_CONFIG_FOUND )
-        IF ( GnomeVfs2_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find gnomevfs2" )
-        ELSE ( GnomeVfs2_FIND_REQUIRED )
-                IF ( NOT GnomeVfs2_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find gnomevfs2" )        
-                ENDIF ( NOT GnomeVfs2_FIND_QUIETLY )
-        ENDIF ( GnomeVfs2_FIND_REQUIRED )
-ENDIF ( NOT GNOMEVFS2_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -114 +104 @@
-        ELSE ( GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS AND _gnomevfs2_FOUND )    
-                IF ( GnomeVfs2_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( GnomeVfs2_FIND_REQUIRED )
-                        IF ( NOT GnomeVfs2_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT GnomeVfs2_FIND_QUIETLY )
-                ENDIF ( GnomeVfs2_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindLibGnome2.cmake

@@ -33 +33 @@
-IF ( LIBGNOME2_MIN_VERSION )
-        pkg_search_module( LIBGNOME2 ${_pkgconfig_REQUIRED} libgnome-2.0>=${LIBGNOME2_MIN_VERSION} )
-        SET (_pkgconfig_version ">=${LIBGNOME2_MIN_VERSION}")
-ELSE ( LIBGNOME2_MIN_VERSION )
-        pkg_search_module( LIBGNOME2 ${_pkgconfig_REQUIRED} libgnome-2.0 )
-        SET (_pkgconfig_version "")
-ENDIF ( LIBGNOME2_MIN_VERSION )
-
-IF ( NOT LIBGNOME2_FOUND AND PKG_CONFIG_FOUND )
-        IF ( LibGnome2_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libgnome2${_pkgconfig_version}" )
-        ELSE ( LibGnome2_FIND_REQUIRED )
-                IF ( NOT LibGnome2_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libgnome2${_pkgconfig_version}" )   
-                ENDIF ( NOT LibGnome2_FIND_QUIETLY )
-        ENDIF ( LibGnome2_FIND_REQUIRED )
-ENDIF ( NOT LIBGNOME2_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -110 +98 @@
-        ELSE ( LIBGNOME2_LIBRARIES AND LIBGNOME2_INCLUDE_DIRS AND _libgnome2_FOUND )    
-                IF ( LibGnome2_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( LibGnome2_FIND_REQUIRED )
-                        IF ( NOT LibGnome2_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT LibGnome2_FIND_QUIETLY )
-                ENDIF ( LibGnome2_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindLibSoup2.cmake

@@ -23 +23 @@
-
-IF ( LIBSOUP2_MIN_VERSION )
-
-
+
-ELSE ( LIBSOUP2_MIN_VERSION )
-
-
+
-ENDIF ( LIBSOUP2_MIN_VERSION )
-
-IF ( NOT LIBSOUP2_FOUND AND PKG_CONFIG_FOUND )
-        IF ( LibSoup2_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libsoup2${_pkgconfig_version}" )
-        ELSE ( LibSoup2_FIND_REQUIRED )
-                IF ( NOT LibSoup2_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libsoup2${_pkgconfig_version}" )    
-                ENDIF ( NOT LibSoup2_FIND_QUIETLY )
-        ENDIF ( LibSoup2_FIND_REQUIRED )
-ENDIF ( NOT LIBSOUP2_FOUND AND PKG_CONFIG_FOUND )
-
-IF( NOT LIBSOUP2_FOUND AND NOT PKG_CONFIG_FOUND )
@@ -91 +80 @@
-        ELSE ( LIBSOUP2_LIBRARIES AND LIBSOUP_INCLUDE_DIRS AND _libsoup2_FOUND )        
-                IF ( LibSoup2_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( LibSoup2_FIND_REQUIRED )
-                        IF ( NOT LibSoup2_FIND_QUIETLY )

branches/3rd-party-cmake-modules/modules/FindLibSyncMl.cmake

@@ -26 +26 @@
-IF ( LIBSYNCML_MIN_VERSION )
-        PKG_SEARCH_MODULE( LIBSYNCML ${_pkgconfig_REQUIRED} libsyncml-1.0>=${LIBSYNCML_MIN_VERSION} )
-        SET (_pkgconfig_version ">=${LIBSYNCML_MIN_VERSION}")
-ELSE( LIBSYNCML_MIN_VERSION )
-        PKG_SEARCH_MODULE( LIBSYNCML ${_pkgconfig_REQUIRED} libsyncml-1.0 )
-        SET (_pkgconfig_version "")
-ENDIF ( LIBSYNCML_MIN_VERSION )
-
-IF ( NOT LIBSYNCML_FOUND AND PKG_CONFIG_FOUND )
-        IF ( LibSyncMl_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libsyncml${_pkgconfig_version}" )
-        ELSE ( LibSyncMl_FIND_REQUIRED )
-                IF ( NOT LibSyncMl_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libsyncml${_pkgconfig_version}" )   
-                ENDIF ( NOT LibSyncMl_FIND_QUIETLY )
-        ENDIF ( LibSyncMl_FIND_REQUIRED )
-ENDIF ( NOT LIBSYNCML_FOUND AND PKG_CONFIG_FOUND )
-
-
@@ -138 +126 @@
-        ELSE ( LIBSYNCML_LIBRARIES AND LIBSYNCML_INCLUDE_DIRS ) 
-                IF ( LibSyncMl_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( LibSyncMl_FIND_REQUIRED )
-                        IF ( NOT LibSyncMl_FIND_QUIETLY )
-END_ERROR
+TATUS
-                        ENDIF ( NOT LibSyncMl_FIND_QUIETLY )
-                ENDIF ( LibSyncMl_FIND_REQUIRED )

branches/3rd-party-cmake-modules/modules/FindLibWbxml2.cmake

@@ -24 +24 @@
-IF ( LIBWBXML2_MIN_VERSION )
-        PKG_SEARCH_MODULE( LIBWBXML2 libwbxml2>=${LIBWBXML2_MIN_VERSION} ${_pkgconfig_REQUIRED} )
-        SET (_pkgconfig_version ">=${LIBWBXML2_MIN_VERSION}" )
-ELSE ( LIBWBXML2_MIN_VERSION )
-        PKG_SEARCH_MODULE( LIBWBXML2 libwbxml2 ${_pkgconfig_REQUIRED} )
-        SET (_pkgconfig_version "" )
-ENDIF ( LIBWBXML2_MIN_VERSION )
-
-IF ( NOT LIBWBXML2_FOUND AND PKG_CONFIG_FOUND )
-        IF ( LibWbxml2_FIND_REQUIRED )
-                MESSAGE( FATAL_ERROR "Could NOT find libwbxml2${_pkgconfig_version}" )
-        ELSE ( LibWbxml2_FIND_REQUIRED )
-                IF ( NOT LibWbxml2_FIND_QUIETLY )
-                        MESSAGE( SEND_ERROR "Could NOT find libwbxml2${_pkgconfig_version}" )   
-                ENDIF ( NOT LibWbxml2_FIND_QUIETLY )
-        ENDIF ( LibWbxml2_FIND_REQUIRED )
-ENDIF ( NOT LIBWBXML2_FOUND AND PKG_CONFIG_FOUND )
-
-IF( NOT LIBWBXML2_FOUND AND NOT PKG_CONFIG_FOUND )
@@ -84 +73 @@
-        ELSE ( LIBWBXML2_LIBRARIES AND LIBWBXML2_INCLUDE_DIRS AND _libwbxml2_FOUND )    
-                IF ( LibWbxml2_FIND_REQUIRED )
-FATAL
+SEND
-                ELSE ( LibWbxml2_FIND_REQUIRED )
-                        IF ( NOT LibWbxml2_FIND_QUIETLY )

branches/3rd-party-cmake-modules/modules/FindORBit2.cmake

@@ -27 +27 @@
-IF ( ORBIT2_MIN_VERSION )
-        pkg_search_module( ORBIT2 ${_pkgconfig_REQUIRED} ORBit-2.0>=${ORBIT2_MIN_VERSION} )
-        SET (_pkgconfig_version ">=${ORBIT2_MIN_VERSION}")
-ELSE ( ORBIT2_MIN_VERSION )
-        pkg_search_module( ORBIT2 ${_pkgconfig_REQUIRED} ORBit-2.0 )
-        SET (_pkgconfig_version "")
-ENDIF ( ORBIT2_MIN_VERSION )
-
-