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.
This commit is contained in:
Aleix Pol
parent
875b56127c
commit
a3641aac25
@ -12,6 +12,7 @@ include(GenerateExportHeader)
|
|||||||
find_package(ECM 0.0.11 REQUIRED NO_MODULE)
|
find_package(ECM 0.0.11 REQUIRED NO_MODULE)
|
||||||
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
|
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
|
||||||
|
|
||||||
|
include(ECMGenerateHeaders)
|
||||||
include(KDEInstallDirs)
|
include(KDEInstallDirs)
|
||||||
include(KDECMakeSettings)
|
include(KDECMakeSettings)
|
||||||
include(KDECompilerSettings)
|
include(KDECompilerSettings)
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
#include "storagetest.h"
|
#include "storagetest.h"
|
||||||
#include <QStandardPaths>
|
#include <QStandardPaths>
|
||||||
|
|
||||||
#include "../private/storage_p.h"
|
#include "plasma/private/storage_p.h"
|
||||||
|
|
||||||
void StorageTest::initTestCase()
|
void StorageTest::initTestCase()
|
||||||
{
|
{
|
||||||
|
|||||||
@ -132,10 +132,10 @@ PRIVATE
|
|||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(KF5Plasma PUBLIC
|
target_include_directories(KF5Plasma PUBLIC
|
||||||
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..;${CMAKE_CURRENT_SOURCE_DIR}/includes>"
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_BINARY_DIR}/Plasma>"
|
||||||
)
|
)
|
||||||
target_include_directories(KF5Plasma INTERFACE
|
target_include_directories(KF5Plasma INTERFACE
|
||||||
"$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR};${INCLUDE_INSTALL_DIR}/KDE>"
|
"$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR};${INCLUDE_INSTALL_DIR}/Plasma>"
|
||||||
)
|
)
|
||||||
|
|
||||||
set_target_properties(KF5Plasma PROPERTIES
|
set_target_properties(KF5Plasma PROPERTIES
|
||||||
@ -146,36 +146,39 @@ set_target_properties(KF5Plasma PROPERTIES
|
|||||||
|
|
||||||
########### install files ###############
|
########### install files ###############
|
||||||
generate_export_header(KF5Plasma BASE_NAME Plasma)
|
generate_export_header(KF5Plasma BASE_NAME Plasma)
|
||||||
|
ecm_generate_headers(Plasma_CamelCase_HEADERS
|
||||||
set(Plasma_LIB_INCLUDES
|
HEADER_NAMES
|
||||||
applet.h
|
Applet
|
||||||
configloader.h
|
ConfigLoader
|
||||||
containment.h
|
Containment
|
||||||
containmentactions.h
|
ContainmentActions
|
||||||
corona.h
|
Corona
|
||||||
datacontainer.h
|
DataContainer
|
||||||
dataengine.h
|
DataEngine
|
||||||
dataengineconsumer.h
|
DataEngineConsumer
|
||||||
pluginloader.h
|
PluginLoader
|
||||||
framesvg.h
|
FrameSvg
|
||||||
package.h
|
Package
|
||||||
packagestructure.h
|
PackageStructure
|
||||||
plasma.h
|
Service
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/plasma_export.h
|
ServiceJob
|
||||||
service.h
|
Svg
|
||||||
servicejob.h
|
Theme
|
||||||
svg.h
|
Plasma
|
||||||
theme.h
|
REQUIRED_HEADERS Plasma_HEADERS
|
||||||
version.h)
|
PREFIX Plasma
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
install(FILES
|
install(FILES
|
||||||
${Plasma_LIB_INCLUDES}
|
${Plasma_CamelCase_HEADERS}
|
||||||
|
${Plasma_HEADERS}
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/plasma_export.h
|
||||||
DESTINATION ${INCLUDE_INSTALL_DIR}/plasma COMPONENT Devel)
|
DESTINATION ${INCLUDE_INSTALL_DIR}/plasma COMPONENT Devel)
|
||||||
|
|
||||||
install(DIRECTORY
|
install(DIRECTORY
|
||||||
includes/Plasma
|
${CMAKE_CURRENT_BINARY_DIR}/Plasma
|
||||||
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/ COMPONENT Devel)
|
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
|
||||||
|
|
||||||
|
|
||||||
install(FILES
|
install(FILES
|
||||||
|
|||||||
@ -1,2 +0,0 @@
|
|||||||
#include "../../plasma/accessappletjob.h"
|
|
||||||
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
#include "../../plasma/accessmanager.h"
|
|
||||||
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
#include "../../plasma/applet.h"
|
|
||||||
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/scripting/appletscript.h"
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
#include "../../plasma/authorizationinterface.h"
|
|
||||||
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
#include "../../plasma/authorizationmanager.h"
|
|
||||||
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
#include "../../plasma/authorizationrule.h"
|
|
||||||
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
#include "../../plasma/clientpinrequest.h"
|
|
||||||
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/configloader.h"
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
#include "../../plasma/containment.h"
|
|
||||||
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
#include "../../plasma/containmentactions.h"
|
|
||||||
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/corona.h"
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
#include "../../plasma/credentials.h"
|
|
||||||
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/datacontainer.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/dataengine.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/dataengineconsumer.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/scripting/dataenginescript.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/framesvg.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/package.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/packagestructure.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/plasma.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/pluginloader.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/scripting/scriptengine.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/service.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/servicejob.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/svg.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/theme.h"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
#include "../../plasma/version.h"
|
|
||||||
@ -13,6 +13,7 @@ set(plasmaquick_LIB_SRC
|
|||||||
|
|
||||||
add_library(KF5PlasmaQuick SHARED ${plasmaquick_LIB_SRC})
|
add_library(KF5PlasmaQuick SHARED ${plasmaquick_LIB_SRC})
|
||||||
add_library(KF5::PlasmaQuick ALIAS KF5PlasmaQuick)
|
add_library(KF5::PlasmaQuick ALIAS KF5PlasmaQuick)
|
||||||
|
target_include_directories(KF5PlasmaQuick PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
|
||||||
|
|
||||||
target_link_libraries(KF5PlasmaQuick
|
target_link_libraries(KF5PlasmaQuick
|
||||||
Qt5::Quick
|
Qt5::Quick
|
||||||
|
|||||||
@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
#include <Plasma/Package>
|
#include <Plasma/Package>
|
||||||
|
|
||||||
#include <plasmaquick/plasmaquick_export.h>
|
#include <plasmaquick_export.h>
|
||||||
|
|
||||||
//
|
//
|
||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
#include <QQmlListProperty>
|
#include <QQmlListProperty>
|
||||||
#include <QAbstractListModel>
|
#include <QAbstractListModel>
|
||||||
|
|
||||||
#include <plasmaquick/plasmaquick_export.h>
|
#include <plasmaquick_export.h>
|
||||||
|
|
||||||
//
|
//
|
||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#include <QQuickView>
|
#include <QQuickView>
|
||||||
|
|
||||||
#include <plasmaquick/plasmaquick_export.h>
|
#include <plasmaquick_export.h>
|
||||||
|
|
||||||
//
|
//
|
||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
|
|||||||
@ -1,2 +0,0 @@
|
|||||||
#include "../../plasmaquick/configview.h"
|
|
||||||
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
#include "../../plasmaquick/packageurlinterceptor.h"
|
|
||||||
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
#include "../../plasmaquick/plasmaquickview.h"
|
|
||||||
|
|
||||||
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
#include <QQmlAbstractUrlInterceptor>
|
#include <QQmlAbstractUrlInterceptor>
|
||||||
|
|
||||||
#include <plasmaquick/plasmaquick_export.h>
|
#include <plasmaquick_export.h>
|
||||||
|
|
||||||
#include <Plasma/Package>
|
#include <Plasma/Package>
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
#include <Plasma/PluginLoader>
|
#include <Plasma/PluginLoader>
|
||||||
|
|
||||||
#include <plasmaquick/plasmaquick_export.h>
|
#include <plasmaquick_export.h>
|
||||||
|
|
||||||
class PLASMAQUICK_EXPORT ShellPluginLoader : public Plasma::PluginLoader
|
class PLASMAQUICK_EXPORT ShellPluginLoader : public Plasma::PluginLoader
|
||||||
{
|
{
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
#include <QtQuick/QQuickView>
|
#include <QtQuick/QQuickView>
|
||||||
|
|
||||||
#include <plasmaquick/plasmaquick_export.h>
|
#include <plasmaquick_export.h>
|
||||||
#include "plasma/corona.h"
|
#include "plasma/corona.h"
|
||||||
#include "plasma/containment.h"
|
#include "plasma/containment.h"
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
#include <QQmlEngine>
|
#include <QQmlEngine>
|
||||||
#include <QSet>
|
#include <QSet>
|
||||||
|
|
||||||
#include <Plasma/AppletScript>
|
#include <plasma/scripting/appletscript.h>
|
||||||
|
|
||||||
class AppletInterface;
|
class AppletInterface;
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user