From 1468725d8200bcc0f5c9130e4fde666e0f164285 Mon Sep 17 00:00:00 2001 From: Will Stephenson Date: Thu, 29 Nov 2007 13:23:40 +0000 Subject: 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 --- modules/FindNetworkManager.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'modules/FindNetworkManager.cmake') 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, # Copyright (c) 2007, Will Stephenson, @@ -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} -- cgit v1.2.1