diff options
| author | Will Stephenson <wstephenson@kde.org> | 2007-11-30 15:27:37 +0000 |
|---|---|---|
| committer | Will Stephenson <wstephenson@kde.org> | 2007-11-30 15:27:37 +0000 |
| commit | f5adbd37061e186d24fe33b0e26d5443380f4275 (patch) | |
| tree | 148269a4c0b9bbbdf514c90cd350c70e203bfce8 | |
| parent | bb012c0137bf6f3cc54ae0ee97c357c07e660383 (diff) | |
| download | extra-cmake-modules-f5adbd37061e186d24fe33b0e26d5443380f4275.tar.gz extra-cmake-modules-f5adbd37061e186d24fe33b0e26d5443380f4275.tar.bz2 | |
Use FindPkgConfig instead of UsePkgConfig as suggested by Alex.
CCMAIL: neundorf@kde.org
svn path=/trunk/KDE/kdelibs/; revision=743304
| -rw-r--r-- | modules/FindNetworkManager.cmake | 41 |
1 files changed, 11 insertions, 30 deletions
diff --git a/modules/FindNetworkManager.cmake b/modules/FindNetworkManager.cmake index 5fa21274..8523bec7 100644 --- a/modules/FindNetworkManager.cmake +++ b/modules/FindNetworkManager.cmake @@ -2,9 +2,9 @@ # Once done this will define # # NETWORKMANAGER_FOUND - system has NetworkManager -# NETWORKMANAGER_INCLUDE_DIR - the NetworkManager include directory -# NETWORKMANAGER_LIBRARY - the libraries needed to use NetworkManager -# NETWORKMANAGER_DEFINITIONS - Compiler switches required for using NetworkManager +# NETWORKMANAGER_INCLUDE_DIRS - the NetworkManager include directories +# NETWORKMANAGER_LIBRARIES - the libraries needed to use NetworkManager +# NETWORKMANAGER_CFLAGS - Compiler switches required for using NetworkManager # NETWORKMANAGER_VERSION - version number of NetworkManager # Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org> @@ -14,42 +14,23 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -IF (NETWORKMANAGER_INCLUDE_DIR AND NM-UTIL_LIBRARY) +IF (NETWORKMANAGER_INCLUDE_DIRS AND NM-UTIL_INCLUDE_DIRS) # in cache already SET(NetworkManager_FIND_QUIETLY TRUE) -ENDIF (NETWORKMANAGER_INCLUDE_DIR AND NM-UTIL_LIBRARY) +ENDIF (NETWORKMANAGER_INCLUDE_DIRS AND NM-UTIL_INCLUDE_DIRS) IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - SET(NETWORKMANAGER_VERSION) - PKGCONFIG_VERSION(NetworkManager _NetworkManagerIncDir _NetworkManagerLinkDir _NetworkManagerLinkFlags _NetworkManagerCflags NETWORKMANAGER_VERSION) - SET(NETWORKMANAGER_DEFINITIONS ${_NetworkManagerCflags}) - PKGCONFIG(libnm-util _libnm-utilIncDir _libnm-utilLinkDir _libnm-utilLinkFlags _libnm-utilCflags) - SET(NM-UTILS_DEFINITIONS ${_libnm-utilCflags}) + INCLUDE(FindPkgConfig) + PKG_SEARCH_MODULE( NETWORKMANAGER NetworkManager ) + PKG_SEARCH_MODULE( NM_UTIL libnm-util ) ENDIF (NOT WIN32) -MESSAGE(STATUS "Found NetworkManager ${NETWORKMANAGER_VERSION}: ${_NetworkManagerLinkFlags}") -FIND_PATH(NETWORKMANAGER_INCLUDE_DIR NetworkManager/NetworkManager.h - PATHS - ${_NetworkManagerIncDir} - ) - -FIND_LIBRARY(NM-UTIL_LIBRARY NAMES nm-util - PATHS - ${_libnm-utilLinkDir} - ) - -IF (NETWORKMANAGER_INCLUDE_DIR AND NM-UTIL_LIBRARY) - SET(NETWORKMANAGER_FOUND TRUE) -ELSE (NETWORKMANAGER_INCLUDE_DIR AND NM-UTIL_LIBRARY) - SET(NETWORKMANAGER_FOUND FALSE) -ENDIF (NETWORKMANAGER_INCLUDE_DIR AND NM-UTIL_LIBRARY) - IF (NETWORKMANAGER_FOUND) IF (NOT NetworkManager_FIND_QUIETLY) - MESSAGE(STATUS "Found libnm-util: ${NM-UTIL_LIBRARY}") + MESSAGE(STATUS "Found NetworkManager ${NETWORKMANAGER_VERSION}: ${NETWORKMANAGER_LIBRARY_DIRS}") + MESSAGE(STATUS "Found libnm-util: ${NM-UTIL_LIBRARY_DIRS}") ENDIF (NOT NetworkManager_FIND_QUIETLY) ELSE (NETWORKMANAGER_FOUND) IF (NetworkManager_FIND_REQUIRED) @@ -57,5 +38,5 @@ ELSE (NETWORKMANAGER_FOUND) ENDIF (NetworkManager_FIND_REQUIRED) ENDIF (NETWORKMANAGER_FOUND) -MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIR NM-UTIL_LIBRARY) +MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIRS NM-UTIL_INCLUDE_DIRS) |