From 17ca3693b3957a5277511964242de54247dd3d46 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 4 Jul 2013 11:15:24 +0200 Subject: [PATCH] Fix build. qt_add_dbus_interface doesn't like directories in the basename --- src/tomahawk/CMakeLists.linux.cmake | 4 ++-- src/tomahawk/linux/GnomeShortcutHandler.h | 2 +- src/tomahawk/linux/UPowerHandler.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tomahawk/CMakeLists.linux.cmake b/src/tomahawk/CMakeLists.linux.cmake index 67613ea3b..18cae6ff5 100644 --- a/src/tomahawk/CMakeLists.linux.cmake +++ b/src/tomahawk/CMakeLists.linux.cmake @@ -6,12 +6,12 @@ FOREACH( _file ${_icons} ) ENDFOREACH( _file ) IF( WITH_UPOWER ) - qt_add_dbus_interface(tomahawkSources "${CMAKE_CURRENT_SOURCE_DIR}/linux/org.freedesktop.UPower.xml" linux/UPowerProxy) + qt4_add_dbus_interface(tomahawkSources "${CMAKE_CURRENT_SOURCE_DIR}/linux/org.freedesktop.UPower.xml" "UPowerProxy") SET( tomahawkSources ${tomahawkSources} linux/UPowerHandler.cpp ) ENDIF( WITH_UPOWER ) IF( WITH_GNOMESHORTCUTHANDLER ) - qt_add_dbus_interface(tomahawkSources "${CMAKE_CURRENT_SOURCE_DIR}/linux/GnomeSettingsDaemonMediaKeys.xml" linux/GnomeSettingsDaemonMediaKeysProxy) + qt_add_dbus_interface(tomahawkSources "${CMAKE_CURRENT_SOURCE_DIR}/linux/GnomeSettingsDaemonMediaKeys.xml" "GnomeSettingsDaemonMediaKeysProxy") SET( tomahawkSources ${tomahawkSources} linux/GnomeShortcutHandler.cpp ) ENDIF( WITH_GNOMESHORTCUTHANDLER ) diff --git a/src/tomahawk/linux/GnomeShortcutHandler.h b/src/tomahawk/linux/GnomeShortcutHandler.h index 3f9d049c2..d0381125b 100644 --- a/src/tomahawk/linux/GnomeShortcutHandler.h +++ b/src/tomahawk/linux/GnomeShortcutHandler.h @@ -20,7 +20,7 @@ #define GNOMESHORTCUTHANDLER_H #include "ShortcutHandler.h" -#include "linux/GnomeSettingsDaemonMediaKeysProxy.h" +#include "GnomeSettingsDaemonMediaKeysProxy.h" #include diff --git a/src/tomahawk/linux/UPowerHandler.h b/src/tomahawk/linux/UPowerHandler.h index 9ee501edf..677a468b7 100644 --- a/src/tomahawk/linux/UPowerHandler.h +++ b/src/tomahawk/linux/UPowerHandler.h @@ -19,7 +19,7 @@ #ifndef UPOWERHANDLER_H #define UPOWERHANDLER_H -#include "linux/UPowerProxy.h" +#include "UPowerProxy.h" #include #include