diff options
| author | Will Stephenson <wstephenson@kde.org> | 2007-11-29 13:23:40 +0000 |
|---|---|---|
| committer | Will Stephenson <wstephenson@kde.org> | 2007-11-29 13:23:40 +0000 |
| commit | 1468725d8200bcc0f5c9130e4fde666e0f164285 (patch) | |
| tree | 462ca142e06d4dcd3900c1877afd5eef3ad8aab9 /modules/FindNetworkManager.cmake | |
| parent | 657bb4ea3dbad5d7bb22974833946ef7cf70675d (diff) | |
| download | extra-cmake-modules-1468725d8200bcc0f5c9130e4fde666e0f164285.tar.gz extra-cmake-modules-1468725d8200bcc0f5c9130e4fde666e0f164285.tar.bz2 | |
Handle the presence of NetworkManager 0.7 in KDE4 builds
*) Adapt MacroEnsureVersion.cmake to be able to check upper limits on
version numbers
*) Adapt kdelibs/cmake/modules/FindNetworkManager.cmake to report the
version found
*) Adapt kdebase/workspace/solid to select which version of
NetworkManager support to build.
*) Move NM 0.6 and NM 0.7 support into separate directories.
NB This is build infrastructure only. There is no Solid backend for NM 0.7. Yet.
CCMAIL: rdieter@math.unl.edu
svn path=/trunk/KDE/kdelibs/; revision=742968
Diffstat (limited to 'modules/FindNetworkManager.cmake')
| -rw-r--r-- | modules/FindNetworkManager.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/FindNetworkManager.cmake b/modules/FindNetworkManager.cmake index e931d091..5fa21274 100644 --- a/modules/FindNetworkManager.cmake +++ b/modules/FindNetworkManager.cmake @@ -5,6 +5,7 @@ # NETWORKMANAGER_INCLUDE_DIR - the NetworkManager include directory # NETWORKMANAGER_LIBRARY - the libraries needed to use NetworkManager # NETWORKMANAGER_DEFINITIONS - Compiler switches required for using NetworkManager +# NETWORKMANAGER_VERSION - version number of NetworkManager # Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org> # Copyright (c) 2007, Will Stephenson, <wstephenson@kde.org> @@ -22,13 +23,14 @@ 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) - PKGCONFIG(NetworkManager _NetworkManagerIncDir _NetworkManagerLinkDir _NetworkManagerLinkFlags _NetworkManagerCflags) + 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}) ENDIF (NOT WIN32) -MESSAGE(STATUS "Found NetworkManager: ${_NetworkManagerLinkFlags}") +MESSAGE(STATUS "Found NetworkManager ${NETWORKMANAGER_VERSION}: ${_NetworkManagerLinkFlags}") FIND_PATH(NETWORKMANAGER_INCLUDE_DIR NetworkManager/NetworkManager.h PATHS ${_NetworkManagerIncDir} |