diff options
| author | Laurent Montel <montel@kde.org> | 2007-08-14 07:11:34 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2007-08-14 07:11:34 +0000 |
| commit | 186950a4056ca1260bee1431baabb099f9cb7c20 (patch) | |
| tree | ad555868bfa4594aa04a8e1ea56370532fa5d54c | |
| parent | 90ff64277a72c3be7b1dd93827d2ab7f13e5c4f2 (diff) | |
| download | extra-cmake-modules-186950a4056ca1260bee1431baabb099f9cb7c20.tar.gz extra-cmake-modules-186950a4056ca1260bee1431baabb099f9cb7c20.tar.bz2 | |
Use find_package_handle_standard_args
Fix previous commit
Remove not necessary path
svn path=/trunk/KDE/kdelibs/; revision=699877
| -rw-r--r-- | modules/FindAvahi.cmake | 22 | ||||
| -rw-r--r-- | modules/FindDNSSD.cmake | 2 | ||||
| -rw-r--r-- | modules/FindPostgreSQL.cmake | 4 |
3 files changed, 4 insertions, 24 deletions
diff --git a/modules/FindAvahi.cmake b/modules/FindAvahi.cmake index 3707b7cd..d328bf19 100644 --- a/modules/FindAvahi.cmake +++ b/modules/FindAvahi.cmake @@ -12,25 +12,11 @@ if (AVAHI_INCLUDE_DIR) endif (AVAHI_INCLUDE_DIR) -FIND_PATH(AVAHI_INCLUDE_DIR avahi-common/defs.h - /usr/include - /usr/local/include - ) +FIND_PATH(AVAHI_INCLUDE_DIR avahi-common/defs.h) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Avahi DEFAULT_MSG + AVAHI_INCLUDE_DIR) -if(AVAHI_INCLUDE_DIR) - set(AVAHI_FOUND TRUE) -endif(AVAHI_INCLUDE_DIR) - - -if(AVAHI_FOUND) - if(NOT Avahi_FIND_QUIETLY) - MESSAGE( STATUS "Avahi common includes found in ${AVAHI_INCLUDE_DIR}") - endif(NOT Avahi_FIND_QUIETLY) -else(AVAHI_FOUND) - if(Avahi_FIND_REQUIRED) - MESSAGE( FATAL_ERROR "Avahi not found") - endif(Avahi_FIND_REQUIRED) -endif(AVAHI_FOUND) MARK_AS_ADVANCED(AVAHI_INCLUDE_DIR) diff --git a/modules/FindDNSSD.cmake b/modules/FindDNSSD.cmake index 7acb82fc..8604bd57 100644 --- a/modules/FindDNSSD.cmake +++ b/modules/FindDNSSD.cmake @@ -14,8 +14,6 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. FIND_PATH(DNSSD_INCLUDE_DIR dns_sd.h - /usr/include - /usr/local/include /usr/include/avahi-compat-libdns_sd/ ) diff --git a/modules/FindPostgreSQL.cmake b/modules/FindPostgreSQL.cmake index 49acf7be..43cb1865 100644 --- a/modules/FindPostgreSQL.cmake +++ b/modules/FindPostgreSQL.cmake @@ -24,10 +24,6 @@ find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h find_library(POSTGRESQL_LIBRARIES NAMES pq) -if(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) - set(POSTGRESQL_FOUND TRUE) -endif(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) - include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PostgreSQL DEFAULT_MSG POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES ) |