Fix compilation on Windows.
This commit is contained in:
parent
5795e27191
commit
da5c9bd30e
9 changed files with 25 additions and 11 deletions
|
@ -1,5 +1,6 @@
|
||||||
|
|
||||||
add_executable(kdeconnect-cli kdeconnect-cli.cpp)
|
add_executable(kdeconnect-cli kdeconnect-cli.cpp)
|
||||||
|
ecm_mark_nongui_executable(kdeconnect-cli)
|
||||||
|
|
||||||
target_link_libraries(kdeconnect-cli kdeconnectinterfaces KF5::CoreAddons KF5::I18n)
|
target_link_libraries(kdeconnect-cli kdeconnectinterfaces KF5::CoreAddons KF5::I18n)
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,6 @@ set_target_properties(kdeconnectcore PROPERTIES
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(kdeconnectcore PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
|
target_include_directories(kdeconnectcore PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
|
||||||
generate_export_header(kdeconnectcore EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kdeconnectcore_export.h BASE_NAME KDEConnectCore)
|
generate_export_header(kdeconnectcore EXPORT_FILE_NAME kdeconnectcore_export.h BASE_NAME KDEConnectCore)
|
||||||
|
|
||||||
install(TARGETS kdeconnectcore EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
|
install(TARGETS kdeconnectcore EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
|
||||||
|
|
|
@ -21,11 +21,6 @@
|
||||||
#include "landevicelink.h"
|
#include "landevicelink.h"
|
||||||
#include "core_debug.h"
|
#include "core_debug.h"
|
||||||
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <netinet/tcp.h>
|
|
||||||
#include <netdb.h>
|
|
||||||
|
|
||||||
#include "../linkprovider.h"
|
#include "../linkprovider.h"
|
||||||
#include "uploadjob.h"
|
#include "uploadjob.h"
|
||||||
#include "downloadjob.h"
|
#include "downloadjob.h"
|
||||||
|
|
|
@ -21,10 +21,12 @@
|
||||||
#include "lanlinkprovider.h"
|
#include "lanlinkprovider.h"
|
||||||
#include "core_debug.h"
|
#include "core_debug.h"
|
||||||
|
|
||||||
|
#ifndef Q_OS_WIN
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <netinet/tcp.h>
|
#include <netinet/tcp.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <QHostInfo>
|
#include <QHostInfo>
|
||||||
#include <QTcpServer>
|
#include <QTcpServer>
|
||||||
|
|
|
@ -7,6 +7,8 @@ add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-kded")
|
||||||
add_executable(kdeconnectd kdeconnectd.cpp)
|
add_executable(kdeconnectd kdeconnectd.cpp)
|
||||||
target_link_libraries(kdeconnectd kdeconnectcore KF5::KIOWidgets KF5::DBusAddons KF5::Notifications KF5::I18n Qt5::Widgets)
|
target_link_libraries(kdeconnectd kdeconnectcore KF5::KIOWidgets KF5::DBusAddons KF5::Notifications KF5::I18n Qt5::Widgets)
|
||||||
|
|
||||||
|
ecm_mark_nongui_executable(kdeconnectd)
|
||||||
|
|
||||||
configure_file(kdeconnectd.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdeconnectd.desktop)
|
configure_file(kdeconnectd.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdeconnectd.desktop)
|
||||||
configure_file(org.kde.kdeconnect.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.service)
|
configure_file(org.kde.kdeconnect.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.service)
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
|
||||||
|
@ -35,9 +34,19 @@
|
||||||
#include "core/device.h"
|
#include "core/device.h"
|
||||||
#include "kdeconnect-version.h"
|
#include "kdeconnect-version.h"
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef Q_OS_WIN
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
static int sigtermfd[2];
|
static int sigtermfd[2];
|
||||||
const static char deadbeef = 1;
|
const static char deadbeef = 1;
|
||||||
|
|
||||||
|
|
||||||
|
// TODO: Implement for Windows.
|
||||||
|
#ifndef Q_OS_WIN
|
||||||
struct sigaction action;
|
struct sigaction action;
|
||||||
|
#endif
|
||||||
|
|
||||||
void sighandler(int signum)
|
void sighandler(int signum)
|
||||||
{
|
{
|
||||||
|
@ -50,6 +59,8 @@ void sighandler(int signum)
|
||||||
|
|
||||||
void initializeTermHandlers(QCoreApplication* app, Daemon* daemon)
|
void initializeTermHandlers(QCoreApplication* app, Daemon* daemon)
|
||||||
{
|
{
|
||||||
|
// TODO: Implement for Windows.
|
||||||
|
#ifndef Q_OS_WIN
|
||||||
::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermfd);
|
::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermfd);
|
||||||
QSocketNotifier* snTerm = new QSocketNotifier(sigtermfd[1], QSocketNotifier::Read, app);
|
QSocketNotifier* snTerm = new QSocketNotifier(sigtermfd[1], QSocketNotifier::Read, app);
|
||||||
QObject::connect(snTerm, SIGNAL(activated(int)), daemon, SLOT(deleteLater()));
|
QObject::connect(snTerm, SIGNAL(activated(int)), daemon, SLOT(deleteLater()));
|
||||||
|
@ -60,6 +71,7 @@ void initializeTermHandlers(QCoreApplication* app, Daemon* daemon)
|
||||||
|
|
||||||
sigaction(SIGTERM, &action, nullptr);
|
sigaction(SIGTERM, &action, nullptr);
|
||||||
sigaction(SIGINT, &action, nullptr);
|
sigaction(SIGINT, &action, nullptr);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
class DesktopDaemon : public Daemon
|
class DesktopDaemon : public Daemon
|
||||||
|
|
|
@ -22,7 +22,7 @@ set_target_properties(kdeconnectpluginkcm PROPERTIES
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(kdeconnectpluginkcm PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
|
target_include_directories(kdeconnectpluginkcm PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
|
||||||
generate_export_header(kdeconnectpluginkcm EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}../core/kdeconnectcore_export.h BASE_NAME kdeconnectpluginkcm)
|
generate_export_header(kdeconnectpluginkcm EXPORT_FILE_NAME kdeconnectpluginkcm_export.h BASE_NAME kdeconnectpluginkcm)
|
||||||
|
|
||||||
# Remove NAMELINK_SKIP if/when headers are being installed and the library
|
# Remove NAMELINK_SKIP if/when headers are being installed and the library
|
||||||
# becomes public.
|
# becomes public.
|
||||||
|
|
|
@ -23,8 +23,8 @@
|
||||||
|
|
||||||
#include <KCModule>
|
#include <KCModule>
|
||||||
|
|
||||||
#include "core/kdeconnectcore_export.h"
|
|
||||||
#include "core/kdeconnectpluginconfig.h"
|
#include "core/kdeconnectpluginconfig.h"
|
||||||
|
#include "kdeconnectpluginkcm_export.h"
|
||||||
|
|
||||||
struct KdeConnectPluginKcmPrivate;
|
struct KdeConnectPluginKcmPrivate;
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ struct KdeConnectPluginKcmPrivate;
|
||||||
* Inheriting your plugin's KCM from this class gets you a easy way to share
|
* Inheriting your plugin's KCM from this class gets you a easy way to share
|
||||||
* configuration values between the KCM and the plugin.
|
* configuration values between the KCM and the plugin.
|
||||||
*/
|
*/
|
||||||
class KDECONNECTCORE_EXPORT KdeConnectPluginKcm
|
class KDECONNECTPLUGINKCM_EXPORT KdeConnectPluginKcm
|
||||||
: public KCModule
|
: public KCModule
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
|
@ -8,7 +8,9 @@ add_subdirectory(mpriscontrol)
|
||||||
add_subdirectory(clipboard)
|
add_subdirectory(clipboard)
|
||||||
add_subdirectory(telephony)
|
add_subdirectory(telephony)
|
||||||
add_subdirectory(battery)
|
add_subdirectory(battery)
|
||||||
add_subdirectory(mousepad)
|
if(NOT WIN32)
|
||||||
|
add_subdirectory(mousepad)
|
||||||
|
endif()
|
||||||
add_subdirectory(share)
|
add_subdirectory(share)
|
||||||
add_subdirectory(notifications)
|
add_subdirectory(notifications)
|
||||||
add_subdirectory(sftp)
|
add_subdirectory(sftp)
|
||||||
|
|
Loading…
Reference in a new issue