diff --git a/cmake/modules/FindNetworkManager.cmake b/cmake/modules/FindNetworkManager.cmake index ced2017c..a82d43da 100644 --- a/cmake/modules/FindNetworkManager.cmake +++ b/cmake/modules/FindNetworkManager.cmake @@ -1,42 +1,40 @@ # - Try to find NetworkManager # Once done this will define # # NETWORKMANAGER_FOUND - system has 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, # 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_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( NETWORKMANAGER libnm ) ENDIF (NOT WIN32) -IF (NETWORKMANAGER_FOUND AND NM-UTIL_FOUND) +IF (NETWORKMANAGER_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 AND NM-UTIL_FOUND) +ELSE (NETWORKMANAGER_FOUND) IF (NetworkManager_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could NOT find NetworkManager or libnm-util, 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) +ENDIF (NETWORKMANAGER_FOUND) -MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIRS NM-UTIL_INCLUDE_DIRS) +MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIRS) diff --git a/src/solid-networkstatus/kded/CMakeLists.txt b/src/solid-networkstatus/kded/CMakeLists.txt index 9fa30651..e8d33d74 100644 --- a/src/solid-networkstatus/kded/CMakeLists.txt +++ b/src/solid-networkstatus/kded/CMakeLists.txt @@ -1,69 +1,67 @@ ########### next target ############### set(kded_networkstatus_PART_SRCS networkstatus.cpp network.cpp systemstatusinterface.cpp wicdstatus.cpp wicdcustomtypes.cpp ) find_package(NetworkManager 0.7.0) set_package_properties(NetworkManager PROPERTIES DESCRIPTION "The NetworkManager headers" URL "http://projects.gnome.org/NetworkManager" TYPE OPTIONAL PURPOSE "Needed for kded's networkstatus module" ) if(NETWORKMANAGER_FOUND) - if(NM_0_7) - message(STATUS "Adding in-process NetworkManager service-wart to kded module") - set(kded_networkstatus_PART_SRCS ${kded_networkstatus_PART_SRCS} networkmanagerstatus.cpp) - include_directories(${NETWORKMANAGER_INCLUDE_DIRS}) - add_definitions(-DNM_BACKEND_ENABLED) - endif() + message(STATUS "Adding in-process NetworkManager service-wart to kded module") + set(kded_networkstatus_PART_SRCS ${kded_networkstatus_PART_SRCS} networkmanagerstatus.cpp) + include_directories(${NETWORKMANAGER_INCLUDE_DIRS}) + add_definitions(-DNM_BACKEND_ENABLED) endif() # FIXME: Re-enable the above when: # * QNTrack has been ported to Qt5 # * cmake/modules/FindQNtrack.cmake has been adapted to the Qt5 dependency #find_package(QNtrack) #set_package_properties(QNtrack PROPERTIES DESCRIPTION "Network status tracking library" # URL "http://launchpad.net/ntrack" # TYPE OPTIONAL # PURPOSE "Provides data input for Solid network status" # ) set(QNTRACK_FOUND FALSE) # Forced to false, see above FIXME if(QNTRACK_FOUND) message(STATUS "Found QNtrack, will use it as a data input for Solid network status") set(kded_networkstatus_PART_SRCS ${kded_networkstatus_PART_SRCS} ntracknetworkstate.cpp) add_definitions(-DHAVE_QNTRACK) else() message(STATUS "QNtrack not found. Can be used as a data input to Solid network status. See https://launchpad.net/ntrack") endif() include_directories(${QNTRACK_INCLUDE_DIR}) qt5_add_dbus_adaptor(kded_networkstatus_PART_SRCS ../org.kde.Solid.Networking.Service.xml networkstatus.h NetworkStatusModule) # we need one of the interfaces installed by kdelibs: qt5_add_dbus_adaptor(kded_networkstatus_PART_SRCS ../../solid/org.kde.Solid.Networking.Client.xml networkstatus.h NetworkStatusModule) add_library(kded_networkstatus MODULE ${kded_networkstatus_PART_SRCS}) set_target_properties(kded_networkstatus PROPERTIES OUTPUT_NAME networkstatus ) kcoreaddons_desktop_to_json(kded_networkstatus networkstatus.desktop SERVICE_TYPES kdedmodule.desktop) target_link_libraries(kded_networkstatus KF5::DBusAddons KF5::Solid KF5::KDELibs4Support) if(QNTRACK_FOUND) target_link_libraries(kded_networkstatus ${QNTRACK_LIBRARIES}) endif() install(TARGETS kded_networkstatus DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kded) diff --git a/src/solid-networkstatus/kded/networkmanagerstatus.h b/src/solid-networkstatus/kded/networkmanagerstatus.h index bbe0879a..2104abd8 100644 --- a/src/solid-networkstatus/kded/networkmanagerstatus.h +++ b/src/solid-networkstatus/kded/networkmanagerstatus.h @@ -1,52 +1,52 @@ /* This file is part of the KDE project Copyright (c) 2010 Klarälvdalens Datakonsult AB, a KDAB Group company Author: Kevin Ottens This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #ifndef NETWORKSTATUS_NETWORKMANAGERSTATUS_H #define NETWORKSTATUS_NETWORKMANAGERSTATUS_H #include "systemstatusinterface.h" #include class NetworkManagerStatus : public SystemStatusInterface { Q_OBJECT public: NetworkManagerStatus( QObject *parent = 0 ); /* reimp */ Solid::Networking::Status status() const; /* reimp */ bool isSupported() const; /* reimp */ QString serviceName() const; -private slots: +private Q_SLOTS: void nmStateChanged( uint nmState ); private: static Solid::Networking::Status convertNmState( uint nmState ); Solid::Networking::Status m_status; mutable QDBusInterface m_manager; }; #endif