diff -ur networkmanagement-0.9.0.12.orig/CMakeLists.txt networkmanagement-0.9.0.12/CMakeLists.txt --- networkmanagement-0.9.0.12.orig/CMakeLists.txt 2020-12-28 12:43:26.738814176 +0300 +++ networkmanagement-0.9.0.12/CMakeLists.txt 2020-12-28 13:14:32.038590757 +0300 @@ -24,32 +24,20 @@ #include(ConfigureChecks.cmake) -find_package(NetworkManager ${MINIMUM_NM_VERSION_REQUIRED}) - -if (NETWORKMANAGER_FOUND) find_package(PkgConfig) - PKG_SEARCH_MODULE( NM-UTIL libnm-util ) - PKG_SEARCH_MODULE( NM-GLIB libnm-glib ) + PKG_SEARCH_MODULE( NM-UTIL libnm ) - if (NOT (NM-UTIL_FOUND AND NM-GLIB_FOUND)) - message(FATAL_ERROR "Could NOT find libnm-util or libnm-glib, check FindPkgConfig output above!") - endif (NOT (NM-UTIL_FOUND AND NM-GLIB_FOUND)) + if (NOT (NM-UTIL_FOUND)) + message(FATAL_ERROR "Could NOT find libnm, check FindPkgConfig output above!") + endif (NOT (NM-UTIL_FOUND)) configure_file(backends/NetworkManager/config-nm09backend.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/backends/NetworkManager/config-nm09backend.h ) - if (${NETWORKMANAGER_VERSION} VERSION_GREATER ${MINIMUM_NM_VERSION_REQUIRED} OR - ${NETWORKMANAGER_VERSION} VERSION_EQUAL ${MINIMUM_NM_VERSION_REQUIRED}) - - if (${NETWORKMANAGER_VERSION} VERSION_LESS "0.9.8") - message(WARNING "Unfortunately with NetworkManager < 0.9.8 we cannot correctly detect when the connection is deactivated (see http://bugs.kde.org/320533)") - endif() - set(NM_0_9 TRUE) add_definitions(-DMINIMUM_NM_VERSION_REQUIRED=\\"${MINIMUM_NM_VERSION_REQUIRED}\\") include_directories( ${NETWORKMANAGER_INCLUDE_DIRS} ${NM-UTIL_INCLUDE_DIRS} - ${NM-GLIB_INCLUDE_DIRS} ${CMAKE_CURRENT_BUILD_DIR} solidcontrolfuture/libs ${KDE4_INCLUDE_DIR}/solid/control @@ -69,12 +57,6 @@ #add_subdirectory(monolithic) install( FILES networkmanagement.notifyrc DESTINATION ${DATA_INSTALL_DIR}/networkmanagement ) - else() - message(FATAL_ERROR "ERROR: NetworkManager version '${NETWORKMANAGER_VERSION}' does not match minimum required (${MINIMUM_NM_VERSION_REQUIRED})") - endif() -else(NETWORKMANAGER_FOUND) - message(FATAL_ERROR "ERROR: NetworkManager headers >= ${MINIMUM_NM_VERSION_REQUIRED} not installed. http://projects.gnome.org/NetworkManager/") -endif(NETWORKMANAGER_FOUND) if(INSTALL_KNM_AUTOSTART) message("Installing autostart file for knm, use cmake -DINSTALL_KNM_AUTOSTART=ON to switch it on. Note that this will break the plasmoid. For this to work, make sure the kded DBus service is NOT loaded.")