changed include dir

This commit is contained in:
Patrick von Reth 2015-03-16 11:50:08 +01:00
parent f95c50111b
commit fe1c1af7e1
75 changed files with 236 additions and 240 deletions

View File

@ -22,7 +22,6 @@ include(ECMPackageConfigHelpers)
include(GenerateExportHeader)
#######################################################################
option(WITH_FRONTENDS "Build frontends currently only useful if WITH_SNORE_DAEMON=ON" OFF)
option(WITH_SNORE_DAEMON "Build the Snore daemon, which redirects notifications" OFF)
@ -30,7 +29,7 @@ option(WITH_SNORE_DAEMON "Build the Snore daemon, which redirects notifications"
set(SNORE_VERSION_MAJOR 0)
set(SNORE_VERSION_MINOR 5)
set(SNORE_VERSION_PATCH 90)
set(SNORE_VERSION_PATCH 91)
set(SNORE_SUFFIX "-qt5")
set(SNORE_CamelCase_SUFFIX "Qt5")

View File

@ -1,6 +1,4 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/core ${CMAKE_CURRENT_BINARY_DIR}/core)
add_subdirectory(core)
add_subdirectory(libsnore)
add_subdirectory(daemon)
add_subdirectory(settings)
add_subdirectory(plugins)

View File

@ -1,7 +1,7 @@
#include "snorenotify.h"
#include "core/log.h"
#include "core/version.h"
#include "libsnore/log.h"
#include "libsnore/version.h"
#include <QApplication>

View File

@ -18,7 +18,7 @@
#include "snorenotify.h"
#include "trayicon.h"
#include "core/snore.h"
#include "libsnore/snore.h"
#include <iostream>
#include <stdlib.h>

View File

@ -17,9 +17,9 @@
*/
#include "trayicon.h"
#include "core/settingsdialog.h"
#include "core/snore.h"
#include "core/snore_p.h"
#include "libsnore/settingsdialog.h"
#include "libsnore/snore.h"
#include "libsnore/snore_p.h"
#include <QAction>
#include <QApplication>
@ -28,7 +28,7 @@
#include <QSystemTrayIcon>
#include <QTimer>
#include "core/version.h"
#include "libsnore/version.h"
using namespace Snore;

View File

@ -20,7 +20,7 @@
#define TRAYICON_H
#include <QAction>
#include "core/snore.h"
#include "libsnore/snore.h"
namespace Snore
{

View File

@ -6,6 +6,8 @@ if(NOT SNORE_REVISION)
set(SNORE_REVISION "")
endif()
set(LIBSNORE_INCLUDE_DIR ${KDE_INSTALL_INCLUDEDIR}/libsnore)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/version.cpp")
QT5_ADD_RESOURCES(SNORENOTIFY_RCS ${SNORE_RCS})
@ -64,12 +66,9 @@ generate_export_header(libsnore
EXPORT_MACRO_NAME SNORE_EXPORT
)
#TODO: drop /core/
target_include_directories(libsnore PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:include/snore/core>)
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src>)
ecm_setup_version("${SNORE_VERSION_MAJOR}.${SNORE_VERSION_MINOR}.${SNORE_VERSION_PATCH}" VARIABLE_PREFIX SOLID
@ -85,7 +84,7 @@ install(TARGETS libsnore EXPORT Libsnore${SNORE_CamelCase_SUFFIX}Target ${KDE_IN
install(EXPORT Libsnore${SNORE_CamelCase_SUFFIX}Target DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/libsnore${SNORE_CamelCase_SUFFIX} NAMESPACE Snore::)
install(FILES ${SnoreNotify_HDR} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/snore/core)
install(FILES ${SnoreNotify_HDR} DESTINATION ${LIBSNORE_INCLUDE_DIR})
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/Libsnore${SNORE_CamelCase_SUFFIX}Config.cmake

View File

@ -13,4 +13,4 @@ set(SnoreNotify_HDR
icon.h
)
install(FILES ${SnoreNotify_HDR} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/snore/core/notification)
install(FILES ${SnoreNotify_HDR} DESTINATION ${LIBSNORE_INCLUDE_DIR}/notification)

View File

@ -18,7 +18,7 @@
#ifndef NOTIFICATION_ICON_H
#define NOTIFICATION_ICON_H
#include "snore_exports.h"
#include "libsnore/snore_exports.h"
#include <QSharedData>
#include <QDebug>

View File

@ -18,11 +18,11 @@
#ifndef NOTIFICATION_H
#define NOTIFICATION_H
#include "snore_exports.h"
#include "libsnore/snore_exports.h"
#include "icon.h"
#include "notificationaction.h"
#include "../hint.h"
#include "../application.h"
#include "libsnore/hint.h"
#include "libsnore/application.h"
#include <QDebug>

View File

@ -19,7 +19,7 @@
#ifndef NOTIFICATIONACTION_H
#define NOTIFICATIONACTION_H
#include "snore_exports.h"
#include "libsnore/snore_exports.h"
#include <QDataStream>

View File

@ -13,4 +13,4 @@ set(SnoreNotify_HDR
pluginsettingswidget.h)
install(FILES ${SnoreNotify_HDR} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/snore/core/plugins)
install(FILES ${SnoreNotify_HDR} DESTINATION ${LIBSNORE_INCLUDE_DIR}/plugins)

View File

@ -18,8 +18,8 @@
#ifndef PLUGINCONTAINER_H
#define PLUGINCONTAINER_H
#include "snore_exports.h"
#include "../snore_p.h"
#include "libsnore/snore_exports.h"
#include "libsnore/snore_p.h"
#include <QPluginLoader>
#include <QDir>

View File

@ -18,10 +18,10 @@
#ifndef SNORE_PLUGINS_H
#define SNORE_PLUGINS_H
#include "snore_exports.h"
#include "snoreglobals.h"
#include "libsnore/snore_exports.h"
#include "libsnore/snoreglobals.h"
#include "libsnore/notification/notification.h"
#include "pluginsettingswidget.h"
#include "../notification/notification.h"
#include <QHash>

View File

@ -18,7 +18,7 @@
#ifndef PLUGINSETTINGSWIDGET_H
#define PLUGINSETTINGSWIDGET_H
#include "snore_exports.h"
#include "libsnore/snore_exports.h"
#include <QWidget>
#include <QFormLayout>

View File

@ -18,10 +18,10 @@
#ifndef SNORE_BACKEND_H
#define SNORE_BACKEND_H
#include "snore_exports.h"
#include "plugins.h"
#include "../notification/notification.h"
#include "../snore.h"
#include "libsnore/snore_exports.h"
#include "libsnore/plugins/plugins.h"
#include "libsnore/notification/notification.h"
#include "libsnore/snore.h"
namespace Snore
{

View File

@ -19,7 +19,7 @@
#ifndef FreedesktopNotification_H
#define FreedesktopNotification_H
#include "core/notification/notification.h"
#include "libsnore/notification/notification.h"
#include <QMetaType>
#include <QDBusArgument>

View File

@ -19,8 +19,8 @@
#include "growlbackend.h"
#include "growlsettings.h"
#include "core/snore.h"
#include "core/snore_p.h"
#include "libsnore/snore.h"
#include "libsnore/snore_p.h"
using namespace Snore;

View File

@ -18,7 +18,7 @@
#ifndef GROWL_BACKEND_H
#define GROWL_BACKEND_H
#include "core/plugins/snorebackend.h"
#include "libsnore/plugins/snorebackend.h"
#include "growl.hpp"
#include <string>

View File

@ -19,11 +19,11 @@
#include "snarl.h"
#include "snarlsettings.h"
#include "core/snore.h"
#include "core/snore_p.h"
#include "core/plugins/plugins.h"
#include "core/plugins/snorebackend.h"
#include "core/notification/notification_p.h"
#include "libsnore/snore.h"
#include "libsnore/snore_p.h"
#include "libsnore/plugins/plugins.h"
#include "libsnore/plugins/snorebackend.h"
#include "libsnore/notification/notification_p.h"
#include <QWidget>

View File

@ -18,7 +18,7 @@
#ifndef SNARL_BACKEND_H
#define SNARL_BACKEND_H
#include "core/plugins/snorebackend.h"
#include "libsnore/plugins/snorebackend.h"
#include "SnarlInterface.h"
class SnarlBackend: public Snore::SnoreBackend

View File

@ -18,7 +18,7 @@
#include "notifywidget.h"
#include "snorenotifier.h"
#include "core/log.h"
#include "libsnore/log.h"
using namespace Snore;

View File

@ -20,7 +20,7 @@
#define NOTIFYWIDGET_H
#include <QSharedMemory>
#include "core/notification/notification.h"
#include "libsnore/notification/notification.h"
#include <QtQuick/QtQuick>

View File

@ -19,8 +19,8 @@
#include "snorenotifier.h"
#include "notifywidget.h"
#include "snorenotifiersettings.h"
#include "core/notification/notification_p.h"
#include "core/snore_p.h"
#include "libsnore/notification/notification_p.h"
#include "libsnore/snore_p.h"
#include <QThread>

View File

@ -19,7 +19,7 @@
#ifndef SNORENOTIFIER_H
#define SNORENOTIFIER_H
#include "core/plugins/snorebackend.h"
#include "libsnore/plugins/snorebackend.h"
#include "notifywidget.h"

View File

@ -1,8 +1,8 @@
#include "snoretoast.h"
#include "core/snore.h"
#include "core/snore_p.h"
#include "core/plugins/plugins.h"
#include "core/plugins/snorebackend.h"
#include "libsnore/snore.h"
#include "libsnore/snore_p.h"
#include "libsnore/plugins/plugins.h"
#include "libsnore/plugins/snorebackend.h"
#include <QDir>
#include <QApplication>

View File

@ -1,7 +1,7 @@
#ifndef TOASTER_H
#define TOASTER_H
#include "core/plugins/snorebackend.h"
#include "libsnore/plugins/snorebackend.h"
#include <QProcess>
class SnoreToast : public Snore::SnoreBackend

View File

@ -1,6 +1,6 @@
#include "trayiconnotifer.h"
#include "core/snore.h"
#include "core/snore_p.h"
#include "libsnore/snore.h"
#include "libsnore/snore_p.h"
#include <QSystemTrayIcon>
using namespace Snore;

View File

@ -1,7 +1,7 @@
#ifndef TRAYICONNOTIFER_H
#define TRAYICONNOTIFER_H
#include "core/plugins/snorebackend.h"
#include "libsnore/plugins/snorebackend.h"
namespace Snore
{

View File

@ -20,9 +20,9 @@
#include "notificationsadaptor.h"
#include "plugins/backends/freedesktop/fredesktopnotification.h"
#include "core/snore.h"
#include "core/version.h"
#include "core/notification/notification_p.h"
#include "libsnore/snore.h"
#include "libsnore/version.h"
#include "libsnore/notification/notification_p.h"
#include <QImage>
#include <QIcon>

View File

@ -18,8 +18,8 @@
#ifndef FREEDESKTOPNOTIFICATION_FRONTEND_H
#define FREEDESKTOPNOTIFICATION_FRONTEND_H
#include "core/plugins/snorefrontend.h"
#include "core/application.h"
#include "libsnore/plugins/snorefrontend.h"
#include "libsnore/application.h"
class NotificationsAdaptor;

View File

@ -19,9 +19,9 @@
#include "parser.h"
#include "snarlnetwork.h"
#include "core/snore.h"
#include "core/notification/notification.h"
#include "core/notification/notification_p.h"
#include "libsnore/snore.h"
#include "libsnore/notification/notification.h"
#include "libsnore/notification/notification_p.h"
#include <QObject>
#include <QTcpSocket>

View File

@ -20,7 +20,7 @@
#define PARSER_H
#include <QString>
#include <QHash>
#include "core/notification/notification.h"
#include "libsnore/notification/notification.h"
#include <QSharedPointer>
#include <QObject>

View File

@ -17,7 +17,7 @@
*/
#include "snarlnetwork.h"
#include "core/snore.h"
#include "libsnore/snore.h"
#include <QTcpServer>
#include <QTcpSocket>

View File

@ -18,8 +18,8 @@
#ifndef SNARLNETWORK_H
#define SNARLNETWORK_H
#include "core/plugins/snorefrontend.h"
#include "core/log.h"
#include "libsnore/plugins/snorefrontend.h"
#include "libsnore/log.h"
#include "parser.h"
#include <QTcpSocket>

View File

@ -18,7 +18,7 @@
#ifndef SOUND_H
#define SOUND_H
#include "plugins/snorebackend.h"
#include "libsnore/plugins/snorebackend.h"
class Sound : public Snore::SnoreSecondaryBackend
{

View File

@ -18,7 +18,7 @@
#ifndef TOASTY_H
#define TOASTY_H
#include "core/plugins/snorebackend.h"
#include "libsnore/plugins/snorebackend.h"
#include <QNetworkAccessManager>

View File

@ -1,6 +1,6 @@
#include "core/snore.h"
#include "core/version.h"
#include "libsnore/snore.h"
#include "libsnore/version.h"
#include "settingswindow.h"
#include <QApplication>

View File

@ -49,7 +49,7 @@
<customwidget>
<class>Snore::SettingsDialog</class>
<extends>QWidget</extends>
<header location="global">core/settingsdialog.h</header>
<header location="global">libsnore/settingsdialog.h</header>
<container>1</container>
</customwidget>
</customwidgets>