$NetBSD$ --- FindNetworkManager.cmake.orig 2015-04-07 15:47:20.000000000 +0000 +++ FindNetworkManager.cmake @@ -14,33 +14,29 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -IF (NETWORKMANAGER_INCLUDE_DIRS AND NM-UTIL_INCLUDE_DIRS) +IF (NETWORKMANAGER_INCLUDE_DIRS) # in cache already SET(NetworkManager_FIND_QUIETLY TRUE) -ENDIF (NETWORKMANAGER_INCLUDE_DIRS AND NM-UTIL_INCLUDE_DIRS) +ENDIF (NETWORKMANAGER_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) - PKG_SEARCH_MODULE( NETWORKMANAGER NetworkManager ) - PKG_SEARCH_MODULE( NM-UTIL libnm-util ) - PKG_SEARCH_MODULE( NM-GLIB libnm-glib ) + PKG_SEARCH_MODULE( NETWORKMANAGER libnm ) ENDIF (NOT WIN32) -IF (NETWORKMANAGER_FOUND AND NM-UTIL_FOUND AND NM-GLIB_FOUND) +IF (NETWORKMANAGER_FOUND) IF (NetworkManager_FIND_VERSION AND ("${NETWORKMANAGER_VERSION}" VERSION_LESS "${NetworkManager_FIND_VERSION}")) MESSAGE(FATAL_ERROR "NetworkManager ${NETWORKMANAGER_VERSION} is too old, need at least ${NetworkManager_FIND_VERSION}") ELSEIF (NOT NetworkManager_FIND_QUIETLY) MESSAGE(STATUS "Found NetworkManager ${NETWORKMANAGER_VERSION}: ${NETWORKMANAGER_LIBRARY_DIRS}") - MESSAGE(STATUS "Found libnm-util: ${NM-UTIL_LIBRARY_DIRS}") - MESSAGE(STATUS "Found libnm-glib: ${NM-GLIB_LIBRARY_DIRS}") ENDIF() -ELSE (NETWORKMANAGER_FOUND AND NM-UTIL_FOUND AND NM-GLIB_FOUND) +ELSE (NETWORKMANAGER_FOUND) IF (NetworkManager_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could NOT find NetworkManager, libnm-util or libnm-glib, check FindPkgConfig output above!") + MESSAGE(FATAL_ERROR "Could NOT find NetworkManager, check FindPkgConfig output above!") ENDIF (NetworkManager_FIND_REQUIRED) -ENDIF (NETWORKMANAGER_FOUND AND NM-UTIL_FOUND AND NM-GLIB_FOUND) +ENDIF (NETWORKMANAGER_FOUND) -MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIRS NM-UTIL_INCLUDE_DIRS) +MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIRS)