Add qgis_core.h to with CORE_EXPORT macro

This removes complexity from the compiler flags because defines happen in a file.
qgis · Jan 4, 2017 · 0302719cf0cb1d5b6e52dc4e1985797dda6917be · 0302719 · nirvn · Jan 5, 2017
1 parent ab77fee
commit 0302719cf0cb1d5b6e52dc4e1985797dda6917be
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -581,7 +581,6 @@ ELSE (WIN32)
 
 ENDIF(WIN32)
 
-ADD_DEFINITIONS("-DCORE_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DGUI_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DPYTHON_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")
@@ -590,6 +589,7 @@ ADD_DEFINITIONS("-DCUSTOMWIDGETS_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DSERVER_EXPORT=${DLLIMPORT}")
 
 SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
+INCLUDE(GenerateExportHeader)
 
 #############################################################
 # user-changeable settings which can be used to customize

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -120,6 +120,7 @@ INCLUDE_DIRECTORIES(
   sip_helpers
 
   ${CMAKE_BINARY_DIR}  # qgsconfig.h, qgsversion.h
+  ${CMAKE_BINARY_DIR}/src/core
 )
 
 IF(NOT ANDROID)

diff --git a/python/sip_helpers/CMakeLists.txt b/python/sip_helpers/CMakeLists.txt
@@ -17,7 +17,8 @@ INCLUDE_DIRECTORIES(SYSTEM
 )
 
 INCLUDE_DIRECTORIES(
-  ${CMAKE_CURRENT_BINARY_DIR}/../core
+  ${CMAKE_BINARY_DIR}/python/core
+  ${CMAKE_BINARY_DIR}/src/core
   ../../src/core
   ../../src/core/auth
   ../../src/core/pal

diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -162,6 +162,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../core/geometry
   ${CMAKE_CURRENT_SOURCE_DIR}/../core/raster
   ${CMAKE_CURRENT_SOURCE_DIR}/../core/symbology-ng
+  ${CMAKE_BINARY_DIR}/src/core
   interpolation
   network
 )

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -524,6 +524,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR} composer legend pluginmanager
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/../ui
+  ${CMAKE_BINARY_DIR}/src/core
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${QWT_INCLUDE_DIR}

diff --git a/src/app/dwg/libdxfrw/CMakeLists.txt b/src/app/dwg/libdxfrw/CMakeLists.txt
@@ -1,5 +1,6 @@
 INCLUDE_DIRECTORIES(
 	${CMAKE_SOURCE_DIR}/src/core
+        ${CMAKE_BINARY_DIR}/src/core
 	${Qt5Core_INCLUDE_DIRS}
 )
 

diff --git a/src/auth/basic/CMakeLists.txt b/src/auth/basic/CMakeLists.txt
@@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
   ../../core
   ../../core/auth
   ../../core/geometry
+  ${CMAKE_BINARY_DIR}/src/core
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${QCA_INCLUDE_DIR}

diff --git a/src/auth/identcert/CMakeLists.txt b/src/auth/identcert/CMakeLists.txt
@@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
   ../../core
   ../../core/auth
   ../../core/geometry
+  ${CMAKE_BINARY_DIR}/src/core
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${QCA_INCLUDE_DIR}

diff --git a/src/auth/pkipaths/CMakeLists.txt b/src/auth/pkipaths/CMakeLists.txt
@@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
   ../../core
   ../../core/auth
   ../../core/geometry
+  ${CMAKE_BINARY_DIR}/src/core
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${QCA_INCLUDE_DIR}

diff --git a/src/auth/pkipkcs12/CMakeLists.txt b/src/auth/pkipkcs12/CMakeLists.txt
@@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES (
   ../../core
   ../../core/auth
   ../../core/geometry
+  ${CMAKE_BINARY_DIR}/src/core
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${QCA_INCLUDE_DIR}

diff --git a/src/browser/CMakeLists.txt b/src/browser/CMakeLists.txt
@@ -65,6 +65,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../gui/editorwidgets/core
   ${CMAKE_CURRENT_BINARY_DIR}/../ui
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/src/core
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${GEOS_INCLUDE_DIR}

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -903,6 +903,7 @@ ENDIF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
   auth
   composer
   dxf
@@ -927,10 +928,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QCA_INCLUDE_DIR}
 )
 
-REMOVE_DEFINITIONS("-DCORE_EXPORT=${DLLIMPORT}")
-ADD_DEFINITIONS("\"-DCORE_EXPORT=${DLLEXPORT}\"")
-
-
 #for PAL classes
 IF (WIN32)
     ADD_DEFINITIONS("-D_HAVE_WINDOWS_H_")
@@ -946,6 +943,14 @@ ADD_DEFINITIONS(-DTEST_DATA_DIR="\\"${TEST_DATA_DIR}\\"")
 
 ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${QGIS_CORE_HDRS} ${QGIS_CORE_MOC_HDRS})
 
+GENERATE_EXPORT_HEADER(
+  qgis_core
+  BASE_NAME CORE
+  EXPORT_FILE_NAME qgis_core.h
+)
+
+SET(QGIS_CORE_HDRS ${QGIS_CORE_HDRS} ${PROJECT_BINARY_DIR}/qgis_core.h)
+
 IF(ENABLE_MODELTEST)
   TARGET_LINK_LIBRARIES(qgis_core ${QT_QTTEST_LIBRARY})
 ENDIF(ENABLE_MODELTEST)

diff --git a/src/core/auth/qgsauthcertutils.h b/src/core/auth/qgsauthcertutils.h
@@ -23,6 +23,8 @@
 #include <QSslCertificate>
 #include <QSslError>
 
+#include "qgis_core.h"
+
 class QgsAuthConfigSslServer;
 
 #define SSL_ISSUER_INFO( var, prop ) var.issuerInfo( prop ).value(0)

diff --git a/src/core/auth/qgsauthcrypto.h b/src/core/auth/qgsauthcrypto.h
@@ -20,6 +20,8 @@
 #include <QFile>
 #include <QString>
 
+#include "qgis_core.h"
+
 /** \ingroup core
  * Funtions for hashing/checking master password and encrypt/decrypting data with password
  * \since 2.8

diff --git a/src/core/auth/qgsauthmethod.h b/src/core/auth/qgsauthmethod.h
@@ -24,6 +24,8 @@
 #include <QStringList>
 #include <QUrl>
 
+#include "qgis_core.h"
+
 class QgsAuthMethodConfig;
 
 /** \ingroup core

diff --git a/src/core/auth/qgsauthmethodmetadata.h b/src/core/auth/qgsauthmethodmetadata.h
@@ -19,6 +19,8 @@
 
 #include <QString>
 
+#include "qgis_core.h"
+
 /** \ingroup core
  * Holds data auth method key, description, and associated shared library file information.
 

diff --git a/src/core/auth/qgsauthmethodregistry.h b/src/core/auth/qgsauthmethodregistry.h
@@ -22,6 +22,8 @@
 #include <QMap>
 #include <QString>
 
+#include "qgis_core.h"
+
 class QgsAuthMethod;
 class QgsAuthMethodMetadata;
 

diff --git a/src/core/composer/qgsaddremoveitemcommand.h b/src/core/composer/qgsaddremoveitemcommand.h
@@ -19,6 +19,9 @@
 #define QGSADDREMOVEITEMCOMMAND_H
 
 #include <QUndoCommand>
+
+#include "qgis_core.h"
+
 class QgsComposerItem;
 class QgsComposition;
 

diff --git a/src/core/composer/qgsaddremovemultiframecommand.h b/src/core/composer/qgsaddremovemultiframecommand.h
@@ -20,6 +20,8 @@
 
 #include <QUndoCommand>
 
+#include "qgis_core.h"
+
 class QgsComposerMultiFrame;
 class QgsComposition;
 

diff --git a/src/core/composer/qgscomposerattributetablemodelv2.h b/src/core/composer/qgscomposerattributetablemodelv2.h
@@ -21,6 +21,8 @@
 #include <QAbstractTableModel>
 #include <QSortFilterProxyModel>
 
+#include "qgis_core.h"
+
 class QgsComposerAttributeTableV2;
 class QgsComposerTableColumn;
 

diff --git a/src/core/composer/qgscomposereffect.h b/src/core/composer/qgscomposereffect.h
@@ -21,6 +21,8 @@
 #include <QGraphicsEffect>
 #include <QPainter>
 
+#include "qgis_core.h"
+
 /** \ingroup core
  * \class QgsComposerEffect
  */

diff --git a/src/core/composer/qgscomposeritemcommand.h b/src/core/composer/qgscomposeritemcommand.h
@@ -21,6 +21,8 @@
 #include <QUndoCommand>
 #include <QDomDocument>
 
+#include "qgis_core.h"
+
 class QgsComposerItem;
 class QgsComposerMultiFrame;
 

diff --git a/src/core/composer/qgscomposermousehandles.h b/src/core/composer/qgscomposermousehandles.h
@@ -20,6 +20,8 @@
 #include <QGraphicsRectItem>
 #include <QObject>
 
+#include "qgis_core.h"
+
 class QgsComposition;
 class QgsComposerItem;
 class QGraphicsView;

diff --git a/src/core/composer/qgscomposermultiframecommand.h b/src/core/composer/qgscomposermultiframecommand.h
@@ -21,6 +21,8 @@
 #include <QUndoCommand>
 #include <QDomDocument>
 
+#include "qgis_core.h"
+
 class QgsComposerMultiFrame;
 
 /** \ingroup core

diff --git a/src/core/composer/qgscomposertablecolumn.h b/src/core/composer/qgscomposertablecolumn.h
@@ -23,6 +23,8 @@
 #include <QDomElement>
 #include <QColor>
 
+#include "qgis_core.h"
+
 /** \ingroup core
  * Stores properties of a column in a QgsComposerTable. Some properties of a QgsComposerTableColumn
 are applicable only in certain contexts. For instance, the attribute and setAttribute methods only

diff --git a/src/core/composer/qgsscalebarstyle.h b/src/core/composer/qgsscalebarstyle.h
@@ -20,6 +20,8 @@
 #include <QIcon>
 #include <QRectF>
 
+#include "qgis_core.h"
+
 class QgsComposerScaleBar;
 class QPainter;
 

diff --git a/src/core/dxf/qgsdxfpaintdevice.h b/src/core/dxf/qgsdxfpaintdevice.h
@@ -20,6 +20,8 @@
 
 #include <QPaintDevice>
 
+#include "qgis_core.h"
+
 class QgsDxfPaintEngine;
 class QgsDxfExport;
 class QPaintEngine;

diff --git a/src/core/effects/qgsimageoperation.h b/src/core/effects/qgsimageoperation.h
@@ -22,6 +22,8 @@
 #include <QColor>
 #include <QtCore/qmath.h>
 
+#include "qgis_core.h"
+
 class QgsColorRamp;
 
 /** \ingroup core

diff --git a/src/core/geometry/qgswkbtypes.h b/src/core/geometry/qgswkbtypes.h
@@ -21,6 +21,8 @@
 #include <QMap>
 #include <QString>
 
+#include "qgis_core.h"
+
 /***************************************************************************
  * This class is considered CRITICAL and any change MUST be accompanied with
  * full unit tests in testqgsstatisticalsummary.cpp.

diff --git a/src/core/gps/qgsgpsconnection.h b/src/core/gps/qgsgpsconnection.h
@@ -22,6 +22,8 @@
 #include <QObject>
 #include <QString>
 
+#include "qgis_core.h"
+
 class QIODevice;
 
 struct CORE_EXPORT QgsSatelliteInfo

diff --git a/src/core/gps/qgsgpsconnectionregistry.h b/src/core/gps/qgsgpsconnectionregistry.h
@@ -21,6 +21,8 @@
 #include <QList>
 #include <QSet>
 
+#include "qgis_core.h"
+
 class QgsGPSConnection;
 
 /** \ingroup core

diff --git a/src/core/gps/qgsgpsdetector.h b/src/core/gps/qgsgpsdetector.h
@@ -22,6 +22,7 @@
 #include <QList>
 #include <QPair>
 
+#include "qgis_core.h"
 #include "qextserialport.h"
 
 class QgsGPSConnection;

diff --git a/src/core/layertree/qgslayertreeregistrybridge.h b/src/core/layertree/qgslayertreeregistrybridge.h
@@ -19,6 +19,8 @@
 #include <QObject>
 #include <QStringList>
 
+#include "qgis_core.h"
+
 class QgsLayerTreeGroup;
 class QgsLayerTreeNode;
 class QgsMapLayer;

diff --git a/src/core/layertree/qgslayertreeutils.h b/src/core/layertree/qgslayertreeutils.h
@@ -19,6 +19,7 @@
 #include <qnamespace.h>
 #include <QList>
 #include <QPair>
+#include "qgis_core.h"
 
 class QDomElement;
 class QDomDocument;

diff --git a/src/core/pal/pointset.h b/src/core/pal/pointset.h
@@ -35,6 +35,8 @@
 #include <QLinkedList>
 #include <geos_c.h>
 
+#include "qgis_core.h"
+
 namespace pal
 {
 

diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -32,7 +32,8 @@
 #include <cmath>
 #include <qnumeric.h>
 
-#include <qgswkbtypes.h>
+#include "qgswkbtypes.h"
+#include "qgis_core.h"
 
 /** \ingroup core
  * The Qgis class provides global constants for use throughout the application.

diff --git a/src/core/qgsattributetableconfig.h b/src/core/qgsattributetableconfig.h
@@ -21,6 +21,8 @@
 #include <QDomNode>
 #include <QVariant>
 
+#include "qgis_core.h"
+
 class QgsFields;
 
 /** \ingroup core

diff --git a/src/core/qgsbearingutils.h b/src/core/qgsbearingutils.h
@@ -21,6 +21,7 @@
 class QgsCoordinateReferenceSystem;
 class QgsPoint;
 
+#include "qgis_core.h"
 
 /**
  * \class QgsBearingUtils

diff --git a/src/core/qgscolorscheme.h b/src/core/qgscolorscheme.h
@@ -23,6 +23,8 @@
 #include <QPair>
 #include <QObject>
 
+#include "qgis_core.h"
+
 /** \ingroup core
  * List of colors paired with a friendly display name identifying the color
  * \note Added in version 2.5

diff --git a/src/core/qgscontexthelp.h b/src/core/qgscontexthelp.h
@@ -23,6 +23,8 @@
 #include <QHash>
 #include <QProcess>
 
+#include "qgis_core.h"
+
 /** \ingroup core
  * Provides a context based help browser for a dialog.
  *

diff --git a/src/core/qgscoordinateutils.h b/src/core/qgscoordinateutils.h
@@ -20,6 +20,8 @@
 
 #include <QString>
 
+#include "qgis_core.h"
+
 class QgsPoint;
 class QgsCoordinateReferenceSystem;
 

diff --git a/src/core/qgscredentials.h b/src/core/qgscredentials.h
@@ -23,6 +23,8 @@
 #include <QMap>
 #include <QMutex>
 
+#include "qgis_core.h"
+
 /** \ingroup core
  * Interface for requesting credentials in QGIS in GUI independent way.
  * This class provides abstraction of a dialog for requesting credentials to the user.