More headers tweaking

Don't install the camel-case headers twice
Look for the plasma_export.h in the current directory instead of jumping
around in the project.
This commit is contained in:
Aleix Pol 2014-03-17 16:48:49 +01:00
parent a3641aac25
commit 2ef12f1ee8
17 changed files with 17 additions and 17 deletions

View File

@ -171,9 +171,9 @@ ecm_generate_headers(Plasma_CamelCase_HEADERS
install(FILES install(FILES
${Plasma_CamelCase_HEADERS}
${Plasma_HEADERS} ${Plasma_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/plasma_export.h ${CMAKE_CURRENT_BINARY_DIR}/plasma_export.h
version.h
DESTINATION ${INCLUDE_INSTALL_DIR}/plasma COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/plasma COMPONENT Devel)
install(DIRECTORY install(DIRECTORY

View File

@ -24,7 +24,7 @@
#include <kconfigskeleton.h> #include <kconfigskeleton.h>
#include <ksharedconfig.h> #include <ksharedconfig.h>
#include <plasma/plasma_export.h> #include "plasma_export.h"
/** /**
* @class ConfigLoader plasma/configloader.h <Plasma/ConfigLoader> * @class ConfigLoader plasma/configloader.h <Plasma/ConfigLoader>

View File

@ -24,7 +24,7 @@
#include <plasma/containment.h> #include <plasma/containment.h>
#include <plasma/plasma.h> #include <plasma/plasma.h>
#include <plasma/plasma_export.h> #include "plasma_export.h"
class QAction; class QAction;

View File

@ -25,7 +25,7 @@
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <kjob.h> #include <kjob.h>
#include <plasma/plasma_export.h> #include "plasma_export.h"
#include <plasma/dataengine.h> #include <plasma/dataengine.h>
class QAbstractItemModel; class QAbstractItemModel;

View File

@ -22,7 +22,7 @@
#include <QtCore/QUrl> #include <QtCore/QUrl>
#include <plasma/plasma_export.h> #include "plasma_export.h"
namespace Plasma namespace Plasma
{ {

View File

@ -24,7 +24,7 @@
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QPixmap> #include <QPixmap>
#include <plasma/plasma_export.h> #include "plasma_export.h"
#include <plasma/plasma.h> #include <plasma/plasma.h>
#include <plasma/svg.h> #include <plasma/svg.h>

View File

@ -25,7 +25,7 @@
#include <kplugininfo.h> #include <kplugininfo.h>
#include <plasma/plasma.h> #include <plasma/plasma.h>
#include <plasma/plasma_export.h> #include "plasma_export.h"
class KJob; class KJob;

View File

@ -25,7 +25,7 @@
#include <kplugininfo.h> #include <kplugininfo.h>
#include <plasma/plasma.h> #include <plasma/plasma.h>
#include <plasma/plasma_export.h> #include "plasma_export.h"
#include <plasma/package.h> #include <plasma/package.h>
namespace Plasma namespace Plasma

View File

@ -24,7 +24,7 @@
#include <QPainterPath> #include <QPainterPath>
#include <plasma/plasma_export.h> #include "plasma_export.h"
class QAction; class QAction;

View File

@ -27,7 +27,7 @@
#include <kplugininfo.h> #include <kplugininfo.h>
#include <plasma/containment.h> #include <plasma/containment.h>
#include <plasma/plasma_export.h> #include "plasma_export.h"
#include <plasma/scripting/scriptengine.h> #include <plasma/scripting/scriptengine.h>
class QAction; class QAction;

View File

@ -22,7 +22,7 @@
#include <kplugininfo.h> #include <kplugininfo.h>
#include <plasma/plasma_export.h> #include "plasma_export.h"
#include <plasma/dataengine.h> #include <plasma/dataengine.h>
#include <plasma/scripting/scriptengine.h> #include <plasma/scripting/scriptengine.h>

View File

@ -21,7 +21,7 @@
#define PLASMA_SCRIPTENGINE_H #define PLASMA_SCRIPTENGINE_H
#include <plasma/package.h> #include <plasma/package.h>
#include <plasma/plasma_export.h> #include "plasma_export.h"
#include <plasma/plasma.h> #include <plasma/plasma.h>
#include <QtCore/QObject> #include <QtCore/QObject>

View File

@ -26,7 +26,7 @@
#include <kconfiggroup.h> #include <kconfiggroup.h>
#include <plasma/plasma_export.h> #include "plasma_export.h"
#include <plasma/plasma.h> #include <plasma/plasma.h>
class QIODevice; class QIODevice;

View File

@ -24,7 +24,7 @@
#include <kjob.h> #include <kjob.h>
#include <plasma/plasma_export.h> #include "plasma_export.h"
namespace Plasma namespace Plasma
{ {

View File

@ -23,7 +23,7 @@
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QPixmap> #include <QPixmap>
#include <plasma/plasma_export.h> #include "plasma_export.h"
class QPainter; class QPainter;
class QPoint; class QPoint;

View File

@ -28,7 +28,7 @@
#include <kplugininfo.h> #include <kplugininfo.h>
#include <ksharedconfig.h> #include <ksharedconfig.h>
#include <plasma/plasma_export.h> #include "plasma_export.h"
namespace Plasma namespace Plasma
{ {

View File

@ -22,7 +22,7 @@
/** @file plasma/version.h <Plasma/Version> */ /** @file plasma/version.h <Plasma/Version> */
#include <plasma/plasma_export.h> #include "plasma_export.h"
#include <plasma_version.h> #include <plasma_version.h>
#define PLASMA_MAKE_VERSION(a,b,c) (((a) << 16) | ((b) << 8) | (c)) #define PLASMA_MAKE_VERSION(a,b,c) (((a) << 16) | ((b) << 8) | (c))