diff options
| author | Will Stephenson <wstephenson@kde.org> | 2007-11-30 16:23:12 +0000 |
|---|---|---|
| committer | Will Stephenson <wstephenson@kde.org> | 2007-11-30 16:23:12 +0000 |
| commit | 4b1db27fa129020c3279847e9d70d394f261d0a4 (patch) | |
| tree | dec2f5275efa6ee7ff1f1382b4b45fc7816dc222 | |
| parent | f5adbd37061e186d24fe33b0e26d5443380f4275 (diff) | |
| download | extra-cmake-modules-4b1db27fa129020c3279847e9d70d394f261d0a4.tar.gz extra-cmake-modules-4b1db27fa129020c3279847e9d70d394f261d0a4.tar.bz2 | |
Adapt to FindPkgConfig
svn path=/trunk/KDE/kdelibs/; revision=743315
| -rw-r--r-- | modules/FindNetworkManager.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
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) |