Changeset 2875

Show
Ignore:
Timestamp:
11/23/07 15:38:44 (1 year ago)
Author:
prahal
Message:

I forgot to add the NOT PKG_CONFIG_FOUND to avoid using the fallback
if pkg-config was found.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2873 r2875  
    3838 
    3939# Look for libebook1.2 include dir and libraries w/o pkg-config. 
    40 IF ( NOT LIBEBOOK1.2_FOUND ) 
     40IF ( NOT LIBEBOOK1.2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    4141        FIND_PATH( _libebook1.2_include_DIR libebook/e-book.h  
    4242                        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 
    …… 
    108108        ENDIF ( LIBEBOOK1.2_LIBRARIES AND LIBEBOOK1.2_INCLUDE_DIRS AND _libebook1.2_FOUND )      
    109109 
    110 ENDIF ( NOT LIBEBOOK1.2_FOUND ) 
     110ENDIF ( NOT LIBEBOOK1.2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    111111# Hide advanced variables from CMake GUIs 
    112112MARK_AS_ADVANCED( LIBEBOOK1.2_LIBRARIES LIBEBOOK1.2_INCLUDE_DIRS ) 

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

    r2873 r2875  
    3838 
    3939# Look for libecal1.0 include dir and libraries w/o pkg-config. 
    40 IF ( NOT LIBECAL1.0_FOUND ) 
     40IF ( NOT LIBECAL1.0_FOUND AND NOT PKG_CONFIG_FOUND ) 
    4141        FIND_PATH( _libecal1.0_include_DIR libecal/e-cal.h  
    4242                        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 
    …… 
    107107        ENDIF ( LIBECAL1.0_LIBRARIES AND LIBECAL1.0_INCLUDE_DIRS AND _libecal1.0_FOUND )         
    108108 
    109 ENDIF ( NOT LIBECAL1.0_FOUND ) 
     109ENDIF ( NOT LIBECAL1.0_FOUND AND NOT PKG_CONFIG_FOUND ) 
    110110# Hide advanced variables from CMake GUIs 
    111111MARK_AS_ADVANCED( LIBECAL1.0_LIBRARIES LIBECAL1.0_INCLUDE_DIRS ) 

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

    r2873 r2875  
    3838 
    3939# Look for libecal1.2 include dir and libraries w/o pkg-config. 
    40 IF ( NOT LIBECAL1.2_FOUND ) 
     40IF ( NOT LIBECAL1.2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    4141        FIND_PATH( _libecal1.2_include_DIR libecal/e-cal.h  
    4242                        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 
    …… 
    108108        ENDIF ( LIBECAL1.2_LIBRARIES AND LIBECAL1.2_INCLUDE_DIRS AND _libecal1.2_FOUND )         
    109109 
    110 ENDIF ( NOT LIBECAL1.2_FOUND ) 
     110ENDIF ( NOT LIBECAL1.2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    111111# Hide advanced variables from CMake GUIs 
    112112MARK_AS_ADVANCED( LIBECAL1.2_LIBRARIES LIBECAL1.2_INCLUDE_DIRS ) 

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

    r2873 r2875  
    3838 
    3939# Look for libedatabook1.0 include dir and libraries w/o pkg-config. 
    40 IF ( NOT LIBEDATABOOK1.0_FOUND ) 
     40IF ( NOT LIBEDATABOOK1.0_FOUND AND NOT PKG_CONFIG_FOUND ) 
    4141        FIND_PATH( _libedatabook1.0_include_DIR libedata-book/e-data-book.h  
    4242                        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 
    …… 
    115115        ENDIF ( LIBEDATABOOK1.0_LIBRARIES AND LIBEDATABOOK1.0_INCLUDE_DIRS AND _libedatabook1.0_FOUND )  
    116116 
    117 ENDIF ( NOT LIBEDATABOOK1.0_FOUND ) 
     117ENDIF ( NOT LIBEDATABOOK1.0_FOUND AND NOT PKG_CONFIG_FOUND ) 
    118118# Hide advanced variables from CMake GUIs 
    119119MARK_AS_ADVANCED( LIBEDATABOOK1.0_LIBRARIES LIBEDATABOOK1.0_INCLUDE_DIRS ) 

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

    r2873 r2875  
    3838 
    3939# Look for libedatabook1.2 include dir and libraries w/o pkg-config. 
    40 IF ( NOT LIBEDATABOOK1.2_FOUND ) 
     40IF ( NOT LIBEDATABOOK1.2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    4141        FIND_PATH( _libedatabook1.2_include_DIR libedata-book/e-data-book.h  
    4242                        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 
    …… 
    115115        ENDIF ( LIBEDATABOOK1.2_LIBRARIES AND LIBEDATABOOK1.2_INCLUDE_DIRS AND _libedatabook1.2_FOUND )  
    116116 
    117 ENDIF ( NOT LIBEDATABOOK1.2_FOUND ) 
     117ENDIF ( NOT LIBEDATABOOK1.2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    118118# Hide advanced variables from CMake GUIs 
    119119MARK_AS_ADVANCED( LIBEDATABOOK1.2_LIBRARIES LIBEDATABOOK1.2_INCLUDE_DIRS ) 

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

    r2873 r2875  
    3838 
    3939# Look for libedatacal1.0 include dir and libraries w/o pkg-config. 
    40 IF ( NOT LIBEDATACAL1.0_FOUND ) 
     40IF ( NOT LIBEDATACAL1.0_FOUND AND NOT PKG_CONFIG_FOUND ) 
    4141        FIND_PATH( _libedatacal1.0_include_DIR libedata-cal/e-data-cal.h  
    4242                        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 
    …… 
    122122        ENDIF ( LIBEDATACAL1.0_LIBRARIES AND LIBEDATACAL1.0_INCLUDE_DIRS AND _libedatacal1.0_FOUND )     
    123123 
    124 ENDIF ( NOT LIBEDATACAL1.0_FOUND ) 
     124ENDIF ( NOT LIBEDATACAL1.0_FOUND AND NOT PKG_CONFIG_FOUND ) 
    125125# Hide advanced variables from CMake GUIs 
    126126MARK_AS_ADVANCED( LIBEDATACAL1.0_LIBRARIES LIBEDATACAL1.0_INCLUDE_DIRS ) 

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

    r2873 r2875  
    3838 
    3939# Look for libedatacal1.2 include dir and libraries w/o pkg-config. 
    40 IF ( NOT LIBEDATACAL1.2_FOUND ) 
     40IF ( NOT LIBEDATACAL1.2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    4141        FIND_PATH( _libedatacal1.2_include_DIR libedata-cal/e-data-cal.h  
    4242                        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 
    …… 
    122122        ENDIF ( LIBEDATACAL1.2_LIBRARIES AND LIBEDATACAL1.2_INCLUDE_DIRS AND _libedatacal1.2_FOUND )     
    123123 
    124 ENDIF ( NOT LIBEDATACAL1.2_FOUND ) 
     124ENDIF ( NOT LIBEDATACAL1.2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    125125# Hide advanced variables from CMake GUIs 
    126126MARK_AS_ADVANCED( LIBEDATACAL1.2_LIBRARIES LIBEDATACAL1.2_INCLUDE_DIRS ) 

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

    r2873 r2875  
    3838 
    3939# Look for libedataserver1.0 include dir and libraries w/o pkg-config. 
    40 IF ( NOT LIBEDATASERVER1.0_FOUND ) 
     40IF ( NOT LIBEDATASERVER1.0_FOUND AND NOT PKG_CONFIG_FOUND ) 
    4141        FIND_PATH( _libedataserver1.0_include_DIR libedataserver/e-account.h  
    4242                        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 
    …… 
    124124        ENDIF ( LIBEDATASERVER1.0_LIBRARIES AND LIBEDATASERVER1.0_INCLUDE_DIRS AND _libedataserver1.0_FOUND )    
    125125 
    126 ENDIF ( NOT LIBEDATASERVER1.0_FOUND ) 
     126ENDIF ( NOT LIBEDATASERVER1.0_FOUND AND NOT PKG_CONFIG_FOUND ) 
    127127# Hide advanced variables from CMake GUIs 
    128128MARK_AS_ADVANCED( LIBEDATASERVER1.0_LIBRARIES LIBEDATASERVER1.0_INCLUDE_DIRS ) 

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

    r2873 r2875  
    3838 
    3939# Look for libedataserver1.2 include dir and libraries w/o pkg-config. 
    40 IF ( NOT LIBEDATASERVER1.2_FOUND ) 
     40IF ( NOT LIBEDATASERVER1.2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    4141        FIND_PATH( _libedataserver1.2_include_DIR libedataserver/e-account.h  
    4242                        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 
    …… 
    124124        ENDIF ( LIBEDATASERVER1.2_LIBRARIES AND LIBEDATASERVER1.2_INCLUDE_DIRS AND _libedataserver1.2_FOUND )    
    125125 
    126 ENDIF ( NOT LIBEDATASERVER1.2_FOUND ) 
     126ENDIF ( NOT LIBEDATASERVER1.2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    127127# Hide advanced variables from CMake GUIs 
    128128MARK_AS_ADVANCED( LIBEDATASERVER1.2_LIBRARIES LIBEDATASERVER1.2_INCLUDE_DIRS ) 

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

    r2873 r2875  
    3838 
    3939# Look for evolutiondataserver1.0 include dir and libraries w/o pkg-config. 
    40 IF ( NOT EVOLUTIONDATASERVER1.0_FOUND ) 
     40IF ( NOT EVOLUTIONDATASERVER1.0_FOUND AND NOT PKG_CONFIG_FOUND ) 
    4141        # Handle dependencies 
    4242        IF ( NOT LIBGNOME2_FOUND ) 
    …… 
    7272        ENDIF ( EVOLUTIONDATASERVER1.0_LIBRARIES AND EVOLUTIONDATASERVER1.0_INCLUDE_DIRS )       
    7373 
    74 ENDIF ( NOT EVOLUTIONDATASERVER1.0_FOUND ) 
     74ENDIF ( NOT EVOLUTIONDATASERVER1.0_FOUND AND NOT PKG_CONFIG_FOUND ) 
    7575# Hide advanced variables from CMake GUIs 
    7676MARK_AS_ADVANCED( EVOLUTIONDATASERVER1.0_LIBRARIES EVOLUTIONDATASERVER1.0_INCLUDE_DIRS ) 

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

    r2873 r2875  
    3838 
    3939# Look for evolutiondataserver1.2 include dir and libraries w/o pkg-config. 
    40 IF ( NOT EVOLUTIONDATASERVER1.2_FOUND ) 
     40IF ( NOT EVOLUTIONDATASERVER1.2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    4141        # Handle dependencies 
    4242        IF ( NOT LIBGNOME2_FOUND ) 
    …… 
    7272        ENDIF ( EVOLUTIONDATASERVER1.2_LIBRARIES AND EVOLUTIONDATASERVER1.2_INCLUDE_DIRS )       
    7373 
    74 ENDIF ( NOT EVOLUTIONDATASERVER1.2_FOUND ) 
     74ENDIF ( NOT EVOLUTIONDATASERVER1.2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    7575# Hide advanced variables from CMake GUIs 
    7676MARK_AS_ADVANCED( EVOLUTIONDATASERVER1.2_LIBRARIES EVOLUTIONDATASERVER1.2_INCLUDE_DIRS ) 

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

    r2874 r2875  
    3838 
    3939# Look for gconf2 include dir and libraries w/o pkgconfig 
    40 IF ( NOT GCONF2_FOUND ) 
     40IF ( NOT GCONF2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    4141        FIND_PATH( _gconf2_include_DIR gconf/gconf.h PATH_SUFFIXES gconf/2  
    4242                PATHS 
    …… 
    9191        ENDIF ( GCONF2_LIBRARIES AND GCONF2_INCLUDE_DIRS AND _gconf2_FOUND )     
    9292 
    93 ENDIF ( NOT GCONF2_FOUND ) 
     93ENDIF ( NOT GCONF2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    9494 
    9595# Hide advanced variables from CMake GUIs 

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

    r2874 r2875  
    3838 
    3939# Look for gnomevfs2 include dir and libraries w/o pkgconfig 
    40 IF ( NOT GNOMEVFS2_FOUND ) 
     40IF ( NOT GNOMEVFS2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    4141        FIND_PATH( _gnomevfs2_include_DIR libgnomevfs/gnome-vfs.h PATH_SUFFIXES gnome-vfs-2.0  
    4242                PATHS 
    …… 
    122122        ENDIF ( GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS AND _gnomevfs2_FOUND )    
    123123 
    124 ENDIF ( NOT GNOMEVFS2_FOUND ) 
     124ENDIF ( NOT GNOMEVFS2_FOUND AND NOT PKG_CONFIG_FOUND ) 
    125125 
    126126# Hide advanced variables from CMake GUIs