From 07acb405620ec881bd2c8c137e86a417a40bf14b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 25 Jun 2007 12:48:39 +0000 Subject: needed outside kdebase/workspace, so move them to kdelibs svn path=/trunk/KDE/kdelibs/; revision=680109 --- modules/FindNetworkManager.cmake | 59 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 modules/FindNetworkManager.cmake (limited to 'modules/FindNetworkManager.cmake') diff --git a/modules/FindNetworkManager.cmake b/modules/FindNetworkManager.cmake new file mode 100644 index 00000000..75f8e347 --- /dev/null +++ b/modules/FindNetworkManager.cmake @@ -0,0 +1,59 @@ +# - Try to find NetworkManager +# Once done this will define +# +# NETWORKMANAGER_FOUND - system has NetworkManager +# NETWORKMANAGER_INCLUDE_DIR - the NetworkManager include directory +# NETWORKMANAGER_LIBRARIES - the libraries needed to use NetworkManager +# NETWORKMANAGER_DEFINITIONS - Compiler switches required for using NetworkManager + +# Copyright (c) 2006, Alexander Neundorf, +# Copyright (c) 2007, Will Stephenson, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +IF (NETWORKMANAGER_INCLUDE_DIR AND NM-UTIL_LIBRARY) + # in cache already + SET(NetworkManager_FIND_QUIETLY TRUE) +ENDIF (NETWORKMANAGER_INCLUDE_DIR AND NM-UTIL_LIBRARY) + +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_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}") +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}") + ENDIF (NOT NetworkManager_FIND_QUIETLY) +ELSE (NETWORKMANAGER_FOUND) + IF (NetworkManager_FIND_REQUIRED) + MESSAGE(SEND_ERROR "Could NOT find NetworkManager") + ENDIF (NetworkManager_FIND_REQUIRED) +ENDIF (NETWORKMANAGER_FOUND) + +MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIR NM-UTIL_LIBRARY) + -- cgit v1.2.1 From ee504248b822e23d59b67a48b83bb3fe1f2bf5d8 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 26 Jun 2007 06:26:50 +0000 Subject: Fix typo svn path=/trunk/KDE/kdelibs/; revision=680418 --- modules/FindNetworkManager.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindNetworkManager.cmake') diff --git a/modules/FindNetworkManager.cmake b/modules/FindNetworkManager.cmake index 75f8e347..cbaae5f1 100644 --- a/modules/FindNetworkManager.cmake +++ b/modules/FindNetworkManager.cmake @@ -51,7 +51,7 @@ IF (NETWORKMANAGER_FOUND) ENDIF (NOT NetworkManager_FIND_QUIETLY) ELSE (NETWORKMANAGER_FOUND) IF (NetworkManager_FIND_REQUIRED) - MESSAGE(SEND_ERROR "Could NOT find NetworkManager") + MESSAGE(FATAL_ERROR "Could NOT find NetworkManager") ENDIF (NetworkManager_FIND_REQUIRED) ENDIF (NETWORKMANAGER_FOUND) -- cgit v1.2.1 From a0ac74e03721c2b1441a733d57377f177ceff7a3 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 20 Aug 2007 06:51:13 +0000 Subject: Use FIND_PACKAGE_HANDLE_STANDARD_ARGS Fix typo svn path=/trunk/KDE/kdelibs/; revision=702150 --- modules/FindNetworkManager.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindNetworkManager.cmake') diff --git a/modules/FindNetworkManager.cmake b/modules/FindNetworkManager.cmake index cbaae5f1..e931d091 100644 --- a/modules/FindNetworkManager.cmake +++ b/modules/FindNetworkManager.cmake @@ -3,7 +3,7 @@ # # NETWORKMANAGER_FOUND - system has NetworkManager # NETWORKMANAGER_INCLUDE_DIR - the NetworkManager include directory -# NETWORKMANAGER_LIBRARIES - the libraries needed to use NetworkManager +# NETWORKMANAGER_LIBRARY - the libraries needed to use NetworkManager # NETWORKMANAGER_DEFINITIONS - Compiler switches required for using NetworkManager # Copyright (c) 2006, Alexander Neundorf, -- cgit v1.2.1 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 From f5adbd37061e186d24fe33b0e26d5443380f4275 Mon Sep 17 00:00:00 2001 From: Will Stephenson Date: Fri, 30 Nov 2007 15:27:37 +0000 Subject: Use FindPkgConfig instead of UsePkgConfig as suggested by Alex. CCMAIL: neundorf@kde.org svn path=/trunk/KDE/kdelibs/; revision=743304 --- modules/FindNetworkManager.cmake | 41 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 30 deletions(-) (limited to 'modules/FindNetworkManager.cmake') 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, @@ -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) -- cgit v1.2.1 From 4b1db27fa129020c3279847e9d70d394f261d0a4 Mon Sep 17 00:00:00 2001 From: Will Stephenson Date: Fri, 30 Nov 2007 16:23:12 +0000 Subject: Adapt to FindPkgConfig svn path=/trunk/KDE/kdelibs/; revision=743315 --- modules/FindNetworkManager.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'modules/FindNetworkManager.cmake') diff --git a/modules/FindNetworkManager.cmake b/modules/FindNetworkManager.cmake index 8523bec7..f85dfb5f 100644 --- a/modules/FindNetworkManager.cmake +++ b/modules/FindNetworkManager.cmake @@ -24,19 +24,19 @@ IF (NOT WIN32) # in the FIND_PATH() and FIND_LIBRARY() calls INCLUDE(FindPkgConfig) PKG_SEARCH_MODULE( NETWORKMANAGER NetworkManager ) - PKG_SEARCH_MODULE( NM_UTIL libnm-util ) + PKG_SEARCH_MODULE( NM-UTIL libnm-util ) ENDIF (NOT WIN32) -IF (NETWORKMANAGER_FOUND) +IF (NETWORKMANAGER_FOUND AND NM-UTIL_FOUND) IF (NOT NetworkManager_FIND_QUIETLY) 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) +ELSE (NETWORKMANAGER_FOUND AND NM-UTIL_FOUND) IF (NetworkManager_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could NOT find NetworkManager") + MESSAGE(FATAL_ERROR "Could NOT find NetworkManager or libnm-util, check FindPkgConfig output above!") ENDIF (NetworkManager_FIND_REQUIRED) -ENDIF (NETWORKMANAGER_FOUND) +ENDIF (NETWORKMANAGER_FOUND AND NM-UTIL_FOUND) MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIRS NM-UTIL_INCLUDE_DIRS) -- cgit v1.2.1 From b6f9515fff4f5e47c8514197474294c7168c3ab7 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 11 Nov 2008 11:50:35 +0000 Subject: Fix it svn path=/trunk/KDE/kdelibs/; revision=882740 --- modules/FindNetworkManager.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindNetworkManager.cmake') diff --git a/modules/FindNetworkManager.cmake b/modules/FindNetworkManager.cmake index f85dfb5f..cd7b9b89 100644 --- a/modules/FindNetworkManager.cmake +++ b/modules/FindNetworkManager.cmake @@ -22,7 +22,7 @@ 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(FindPkgConfig) + find_package((PkgConfig) PKG_SEARCH_MODULE( NETWORKMANAGER NetworkManager ) PKG_SEARCH_MODULE( NM-UTIL libnm-util ) ENDIF (NOT WIN32) -- cgit v1.2.1 From d57a5300870f104da25a7d43aa077afa6e50f1cc Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Tue, 11 Nov 2008 12:45:40 +0000 Subject: Fix syntax errors svn path=/trunk/KDE/kdelibs/; revision=882809 --- modules/FindNetworkManager.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindNetworkManager.cmake') diff --git a/modules/FindNetworkManager.cmake b/modules/FindNetworkManager.cmake index cd7b9b89..ced2017c 100644 --- a/modules/FindNetworkManager.cmake +++ b/modules/FindNetworkManager.cmake @@ -22,7 +22,7 @@ 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 - find_package((PkgConfig) + find_package(PkgConfig) PKG_SEARCH_MODULE( NETWORKMANAGER NetworkManager ) PKG_SEARCH_MODULE( NM-UTIL libnm-util ) ENDIF (NOT WIN32) -- cgit v1.2.1