From a3641aac254a0d9f19ebb6273b9e658c7781642f Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Mon, 17 Mar 2014 16:28:24 +0100 Subject: [PATCH] Fix headers management in plasma-framework Use generate headers instead of having them stored in the repository. Figure out how relative paths are forwarded around, there were some weird things. Stop installing plasma header files in the KDE/ prefix. --- CMakeLists.txt | 1 + autotests/storagetest.cpp | 2 +- src/plasma/CMakeLists.txt | 55 ++++++++++--------- src/plasma/includes/Plasma/AccessAppletJob | 2 - src/plasma/includes/Plasma/AccessManager | 2 - src/plasma/includes/Plasma/Applet | 2 - src/plasma/includes/Plasma/AppletScript | 1 - .../includes/Plasma/AuthorizationInterface | 2 - .../includes/Plasma/AuthorizationManager | 2 - src/plasma/includes/Plasma/AuthorizationRule | 2 - src/plasma/includes/Plasma/ClientPinRequest | 2 - src/plasma/includes/Plasma/ConfigLoader | 1 - src/plasma/includes/Plasma/Containment | 2 - src/plasma/includes/Plasma/ContainmentActions | 2 - src/plasma/includes/Plasma/Corona | 1 - src/plasma/includes/Plasma/Credentials | 2 - src/plasma/includes/Plasma/DataContainer | 1 - src/plasma/includes/Plasma/DataEngine | 1 - src/plasma/includes/Plasma/DataEngineConsumer | 1 - src/plasma/includes/Plasma/DataEngineScript | 1 - src/plasma/includes/Plasma/FrameSvg | 1 - src/plasma/includes/Plasma/Package | 1 - src/plasma/includes/Plasma/PackageStructure | 1 - src/plasma/includes/Plasma/Plasma | 1 - src/plasma/includes/Plasma/PluginLoader | 1 - src/plasma/includes/Plasma/ScriptEngine | 1 - src/plasma/includes/Plasma/Service | 1 - src/plasma/includes/Plasma/ServiceJob | 1 - src/plasma/includes/Plasma/Svg | 1 - src/plasma/includes/Plasma/Theme | 1 - src/plasma/includes/Plasma/Version | 1 - src/plasmaquick/CMakeLists.txt | 1 + src/plasmaquick/appletquickitem.h | 2 +- src/plasmaquick/configmodel.h | 2 +- src/plasmaquick/configview.h | 2 +- .../includes/PlasmaQuick/ConfigView | 2 - .../PlasmaQuick/PackageUrlInterceptor | 2 - .../includes/PlasmaQuick/PlasmaQuickView | 2 - src/plasmaquick/packageurlinterceptor.h | 2 +- src/plasmaquick/shellpluginloader.h | 2 +- src/plasmaquick/view.h | 2 +- .../qml/plasmoid/declarativeappletscript.h | 2 +- 42 files changed, 39 insertions(+), 78 deletions(-) delete mode 100644 src/plasma/includes/Plasma/AccessAppletJob delete mode 100644 src/plasma/includes/Plasma/AccessManager delete mode 100644 src/plasma/includes/Plasma/Applet delete mode 100644 src/plasma/includes/Plasma/AppletScript delete mode 100644 src/plasma/includes/Plasma/AuthorizationInterface delete mode 100644 src/plasma/includes/Plasma/AuthorizationManager delete mode 100644 src/plasma/includes/Plasma/AuthorizationRule delete mode 100644 src/plasma/includes/Plasma/ClientPinRequest delete mode 100644 src/plasma/includes/Plasma/ConfigLoader delete mode 100644 src/plasma/includes/Plasma/Containment delete mode 100644 src/plasma/includes/Plasma/ContainmentActions delete mode 100644 src/plasma/includes/Plasma/Corona delete mode 100644 src/plasma/includes/Plasma/Credentials delete mode 100644 src/plasma/includes/Plasma/DataContainer delete mode 100644 src/plasma/includes/Plasma/DataEngine delete mode 100644 src/plasma/includes/Plasma/DataEngineConsumer delete mode 100644 src/plasma/includes/Plasma/DataEngineScript delete mode 100644 src/plasma/includes/Plasma/FrameSvg delete mode 100644 src/plasma/includes/Plasma/Package delete mode 100644 src/plasma/includes/Plasma/PackageStructure delete mode 100644 src/plasma/includes/Plasma/Plasma delete mode 100644 src/plasma/includes/Plasma/PluginLoader delete mode 100644 src/plasma/includes/Plasma/ScriptEngine delete mode 100644 src/plasma/includes/Plasma/Service delete mode 100644 src/plasma/includes/Plasma/ServiceJob delete mode 100644 src/plasma/includes/Plasma/Svg delete mode 100644 src/plasma/includes/Plasma/Theme delete mode 100644 src/plasma/includes/Plasma/Version delete mode 100644 src/plasmaquick/includes/PlasmaQuick/ConfigView delete mode 100644 src/plasmaquick/includes/PlasmaQuick/PackageUrlInterceptor delete mode 100644 src/plasmaquick/includes/PlasmaQuick/PlasmaQuickView diff --git a/CMakeLists.txt b/CMakeLists.txt index 115c930bb..1764afb3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,7 @@ include(GenerateExportHeader) find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +include(ECMGenerateHeaders) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) diff --git a/autotests/storagetest.cpp b/autotests/storagetest.cpp index b80b28925..8a7dbd0d9 100644 --- a/autotests/storagetest.cpp +++ b/autotests/storagetest.cpp @@ -20,7 +20,7 @@ #include "storagetest.h" #include -#include "../private/storage_p.h" +#include "plasma/private/storage_p.h" void StorageTest::initTestCase() { diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt index ae94d37d5..0403b9f66 100644 --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -132,10 +132,10 @@ PRIVATE ) target_include_directories(KF5Plasma PUBLIC - "$" + "$" ) target_include_directories(KF5Plasma INTERFACE - "$" + "$" ) set_target_properties(KF5Plasma PROPERTIES @@ -146,36 +146,39 @@ set_target_properties(KF5Plasma PROPERTIES ########### install files ############### generate_export_header(KF5Plasma BASE_NAME Plasma) - -set(Plasma_LIB_INCLUDES - applet.h - configloader.h - containment.h - containmentactions.h - corona.h - datacontainer.h - dataengine.h - dataengineconsumer.h - pluginloader.h - framesvg.h - package.h - packagestructure.h - plasma.h - ${CMAKE_CURRENT_BINARY_DIR}/plasma_export.h - service.h - servicejob.h - svg.h - theme.h - version.h) +ecm_generate_headers(Plasma_CamelCase_HEADERS + HEADER_NAMES + Applet + ConfigLoader + Containment + ContainmentActions + Corona + DataContainer + DataEngine + DataEngineConsumer + PluginLoader + FrameSvg + Package + PackageStructure + Service + ServiceJob + Svg + Theme + Plasma + REQUIRED_HEADERS Plasma_HEADERS + PREFIX Plasma +) install(FILES - ${Plasma_LIB_INCLUDES} + ${Plasma_CamelCase_HEADERS} + ${Plasma_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/plasma_export.h DESTINATION ${INCLUDE_INSTALL_DIR}/plasma COMPONENT Devel) install(DIRECTORY - includes/Plasma - DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/ COMPONENT Devel) + ${CMAKE_CURRENT_BINARY_DIR}/Plasma + DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) install(FILES diff --git a/src/plasma/includes/Plasma/AccessAppletJob b/src/plasma/includes/Plasma/AccessAppletJob deleted file mode 100644 index 66560e152..000000000 --- a/src/plasma/includes/Plasma/AccessAppletJob +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../plasma/accessappletjob.h" - diff --git a/src/plasma/includes/Plasma/AccessManager b/src/plasma/includes/Plasma/AccessManager deleted file mode 100644 index f28887c48..000000000 --- a/src/plasma/includes/Plasma/AccessManager +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../plasma/accessmanager.h" - diff --git a/src/plasma/includes/Plasma/Applet b/src/plasma/includes/Plasma/Applet deleted file mode 100644 index 3ece63781..000000000 --- a/src/plasma/includes/Plasma/Applet +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../plasma/applet.h" - diff --git a/src/plasma/includes/Plasma/AppletScript b/src/plasma/includes/Plasma/AppletScript deleted file mode 100644 index b003ef6a5..000000000 --- a/src/plasma/includes/Plasma/AppletScript +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/scripting/appletscript.h" diff --git a/src/plasma/includes/Plasma/AuthorizationInterface b/src/plasma/includes/Plasma/AuthorizationInterface deleted file mode 100644 index 1ca2c7899..000000000 --- a/src/plasma/includes/Plasma/AuthorizationInterface +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../plasma/authorizationinterface.h" - diff --git a/src/plasma/includes/Plasma/AuthorizationManager b/src/plasma/includes/Plasma/AuthorizationManager deleted file mode 100644 index 68fcebb26..000000000 --- a/src/plasma/includes/Plasma/AuthorizationManager +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../plasma/authorizationmanager.h" - diff --git a/src/plasma/includes/Plasma/AuthorizationRule b/src/plasma/includes/Plasma/AuthorizationRule deleted file mode 100644 index 22eb31f18..000000000 --- a/src/plasma/includes/Plasma/AuthorizationRule +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../plasma/authorizationrule.h" - diff --git a/src/plasma/includes/Plasma/ClientPinRequest b/src/plasma/includes/Plasma/ClientPinRequest deleted file mode 100644 index dad511f49..000000000 --- a/src/plasma/includes/Plasma/ClientPinRequest +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../plasma/clientpinrequest.h" - diff --git a/src/plasma/includes/Plasma/ConfigLoader b/src/plasma/includes/Plasma/ConfigLoader deleted file mode 100644 index 99951b74f..000000000 --- a/src/plasma/includes/Plasma/ConfigLoader +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/configloader.h" diff --git a/src/plasma/includes/Plasma/Containment b/src/plasma/includes/Plasma/Containment deleted file mode 100644 index bf431ebda..000000000 --- a/src/plasma/includes/Plasma/Containment +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../plasma/containment.h" - diff --git a/src/plasma/includes/Plasma/ContainmentActions b/src/plasma/includes/Plasma/ContainmentActions deleted file mode 100644 index d957523e7..000000000 --- a/src/plasma/includes/Plasma/ContainmentActions +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../plasma/containmentactions.h" - diff --git a/src/plasma/includes/Plasma/Corona b/src/plasma/includes/Plasma/Corona deleted file mode 100644 index 2e49ea9e8..000000000 --- a/src/plasma/includes/Plasma/Corona +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/corona.h" diff --git a/src/plasma/includes/Plasma/Credentials b/src/plasma/includes/Plasma/Credentials deleted file mode 100644 index 8f9cc5592..000000000 --- a/src/plasma/includes/Plasma/Credentials +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../plasma/credentials.h" - diff --git a/src/plasma/includes/Plasma/DataContainer b/src/plasma/includes/Plasma/DataContainer deleted file mode 100644 index a93149547..000000000 --- a/src/plasma/includes/Plasma/DataContainer +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/datacontainer.h" diff --git a/src/plasma/includes/Plasma/DataEngine b/src/plasma/includes/Plasma/DataEngine deleted file mode 100644 index 951ef3b9b..000000000 --- a/src/plasma/includes/Plasma/DataEngine +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/dataengine.h" diff --git a/src/plasma/includes/Plasma/DataEngineConsumer b/src/plasma/includes/Plasma/DataEngineConsumer deleted file mode 100644 index cc30f0e5b..000000000 --- a/src/plasma/includes/Plasma/DataEngineConsumer +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/dataengineconsumer.h" diff --git a/src/plasma/includes/Plasma/DataEngineScript b/src/plasma/includes/Plasma/DataEngineScript deleted file mode 100644 index 1a1c52a94..000000000 --- a/src/plasma/includes/Plasma/DataEngineScript +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/scripting/dataenginescript.h" diff --git a/src/plasma/includes/Plasma/FrameSvg b/src/plasma/includes/Plasma/FrameSvg deleted file mode 100644 index d8bd906ce..000000000 --- a/src/plasma/includes/Plasma/FrameSvg +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/framesvg.h" diff --git a/src/plasma/includes/Plasma/Package b/src/plasma/includes/Plasma/Package deleted file mode 100644 index af584e37b..000000000 --- a/src/plasma/includes/Plasma/Package +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/package.h" diff --git a/src/plasma/includes/Plasma/PackageStructure b/src/plasma/includes/Plasma/PackageStructure deleted file mode 100644 index d203989e4..000000000 --- a/src/plasma/includes/Plasma/PackageStructure +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/packagestructure.h" diff --git a/src/plasma/includes/Plasma/Plasma b/src/plasma/includes/Plasma/Plasma deleted file mode 100644 index 4870002a5..000000000 --- a/src/plasma/includes/Plasma/Plasma +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/plasma.h" diff --git a/src/plasma/includes/Plasma/PluginLoader b/src/plasma/includes/Plasma/PluginLoader deleted file mode 100644 index 670d80d46..000000000 --- a/src/plasma/includes/Plasma/PluginLoader +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/pluginloader.h" \ No newline at end of file diff --git a/src/plasma/includes/Plasma/ScriptEngine b/src/plasma/includes/Plasma/ScriptEngine deleted file mode 100644 index 472eee1a3..000000000 --- a/src/plasma/includes/Plasma/ScriptEngine +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/scripting/scriptengine.h" diff --git a/src/plasma/includes/Plasma/Service b/src/plasma/includes/Plasma/Service deleted file mode 100644 index 1aeea7be2..000000000 --- a/src/plasma/includes/Plasma/Service +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/service.h" diff --git a/src/plasma/includes/Plasma/ServiceJob b/src/plasma/includes/Plasma/ServiceJob deleted file mode 100644 index 6e2b13651..000000000 --- a/src/plasma/includes/Plasma/ServiceJob +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/servicejob.h" diff --git a/src/plasma/includes/Plasma/Svg b/src/plasma/includes/Plasma/Svg deleted file mode 100644 index 16652f457..000000000 --- a/src/plasma/includes/Plasma/Svg +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/svg.h" diff --git a/src/plasma/includes/Plasma/Theme b/src/plasma/includes/Plasma/Theme deleted file mode 100644 index aaaf0fb9b..000000000 --- a/src/plasma/includes/Plasma/Theme +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/theme.h" diff --git a/src/plasma/includes/Plasma/Version b/src/plasma/includes/Plasma/Version deleted file mode 100644 index 61716764e..000000000 --- a/src/plasma/includes/Plasma/Version +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/version.h" diff --git a/src/plasmaquick/CMakeLists.txt b/src/plasmaquick/CMakeLists.txt index b9ac8e189..db39cc483 100644 --- a/src/plasmaquick/CMakeLists.txt +++ b/src/plasmaquick/CMakeLists.txt @@ -13,6 +13,7 @@ set(plasmaquick_LIB_SRC add_library(KF5PlasmaQuick SHARED ${plasmaquick_LIB_SRC}) add_library(KF5::PlasmaQuick ALIAS KF5PlasmaQuick) +target_include_directories(KF5PlasmaQuick PUBLIC "$") target_link_libraries(KF5PlasmaQuick Qt5::Quick diff --git a/src/plasmaquick/appletquickitem.h b/src/plasmaquick/appletquickitem.h index 1deaea985..54249dfa2 100644 --- a/src/plasmaquick/appletquickitem.h +++ b/src/plasmaquick/appletquickitem.h @@ -28,7 +28,7 @@ #include -#include +#include // // W A R N I N G diff --git a/src/plasmaquick/configmodel.h b/src/plasmaquick/configmodel.h index 1e7bd925c..7ac1a6e2a 100644 --- a/src/plasmaquick/configmodel.h +++ b/src/plasmaquick/configmodel.h @@ -24,7 +24,7 @@ #include #include -#include +#include // // W A R N I N G diff --git a/src/plasmaquick/configview.h b/src/plasmaquick/configview.h index 06f0a6c85..b3bbffd3b 100644 --- a/src/plasmaquick/configview.h +++ b/src/plasmaquick/configview.h @@ -23,7 +23,7 @@ #include -#include +#include // // W A R N I N G diff --git a/src/plasmaquick/includes/PlasmaQuick/ConfigView b/src/plasmaquick/includes/PlasmaQuick/ConfigView deleted file mode 100644 index ab5d2ed32..000000000 --- a/src/plasmaquick/includes/PlasmaQuick/ConfigView +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../plasmaquick/configview.h" - diff --git a/src/plasmaquick/includes/PlasmaQuick/PackageUrlInterceptor b/src/plasmaquick/includes/PlasmaQuick/PackageUrlInterceptor deleted file mode 100644 index 025107a1a..000000000 --- a/src/plasmaquick/includes/PlasmaQuick/PackageUrlInterceptor +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../plasmaquick/packageurlinterceptor.h" - diff --git a/src/plasmaquick/includes/PlasmaQuick/PlasmaQuickView b/src/plasmaquick/includes/PlasmaQuick/PlasmaQuickView deleted file mode 100644 index 71109bd86..000000000 --- a/src/plasmaquick/includes/PlasmaQuick/PlasmaQuickView +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../plasmaquick/plasmaquickview.h" - diff --git a/src/plasmaquick/packageurlinterceptor.h b/src/plasmaquick/packageurlinterceptor.h index 08e44e834..9b679962e 100644 --- a/src/plasmaquick/packageurlinterceptor.h +++ b/src/plasmaquick/packageurlinterceptor.h @@ -22,7 +22,7 @@ #include -#include +#include #include diff --git a/src/plasmaquick/shellpluginloader.h b/src/plasmaquick/shellpluginloader.h index 7ef8dabb3..3f9ea8ef0 100644 --- a/src/plasmaquick/shellpluginloader.h +++ b/src/plasmaquick/shellpluginloader.h @@ -22,7 +22,7 @@ #include -#include +#include class PLASMAQUICK_EXPORT ShellPluginLoader : public Plasma::PluginLoader { diff --git a/src/plasmaquick/view.h b/src/plasmaquick/view.h index 16bdd4be3..2ed5ef647 100644 --- a/src/plasmaquick/view.h +++ b/src/plasmaquick/view.h @@ -21,7 +21,7 @@ #include -#include +#include #include "plasma/corona.h" #include "plasma/containment.h" diff --git a/src/scriptengines/qml/plasmoid/declarativeappletscript.h b/src/scriptengines/qml/plasmoid/declarativeappletscript.h index a3257ab7e..c24e186ce 100644 --- a/src/scriptengines/qml/plasmoid/declarativeappletscript.h +++ b/src/scriptengines/qml/plasmoid/declarativeappletscript.h @@ -24,7 +24,7 @@ #include #include -#include +#include class AppletInterface;