Add qgis_analysis.h with ANALYSIS_EXPORT macro

CMakeLists.txt

@@ -581,7 +581,6 @@ ELSE (WIN32)
 
 ENDIF(WIN32)
 
-ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DCUSTOMWIDGETS_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DSERVER_EXPORT=${DLLIMPORT}")

python/CMakeLists.txt

@@ -121,6 +121,7 @@ INCLUDE_DIRECTORIES(
 
   ${CMAKE_BINARY_DIR}  # qgsconfig.h, qgsversion.h
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/analysis
 )
 
 IF(NOT ANDROID)

src/analysis/CMakeLists.txt

@@ -163,6 +163,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../core/raster
   ${CMAKE_CURRENT_SOURCE_DIR}/../core/symbology-ng
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/analysis
   interpolation
   network
 )
@@ -173,9 +174,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${SQLITE3_INCLUDE_DIR}
 )
 
-REMOVE_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")
-ADD_DEFINITIONS("\"-DANALYSIS_EXPORT=${DLLEXPORT}\"")
-
 #############################################################
 # qgis_analysis library
 
@@ -208,6 +206,14 @@ ENDIF (NOT ANDROID)
 
 TARGET_LINK_LIBRARIES(qgis_analysis qgis_core)
 
+GENERATE_EXPORT_HEADER(
+   qgis_analysis
+   BASE_NAME ANALYSIS
+   EXPORT_FILE_NAME qgis_analysis.h
+ )
+
+SET(QGIS_ANALYSIS_HDRS ${QGIS_ANALYSIS_HDRS} ${PROJECT_BINARY_DIR}/qgis_analysis.h)
+
 
 # install
 

src/analysis/interpolation/Bezier3D.h

@@ -19,6 +19,7 @@
 
 #include "ParametricLine.h"
 #include "qgslogger.h"
+#include "qgis_analysis.h"
 
 /** \ingroup analysis
  * Class Bezier3D represents a bezier curve, represented by control points. Parameter t is running from 0 to 1. The class is capable to calculate the curve point and the first two derivatives belonging to t.*/

src/analysis/interpolation/CloughTocherInterpolator.h

@@ -19,6 +19,7 @@
 
 #include "TriangleInterpolator.h"
 #include "Point3D.h"
+#include "qgis_analysis.h"
 
 class NormVecDecorator;
 

src/analysis/interpolation/DualEdgeTriangulation.h

@@ -31,6 +31,7 @@
 #include <QStringList>
 #include <QProgressDialog>
 #include <QCursor>
+#include "qgis_analysis.h"
 
 /** \ingroup analysis
  * DualEdgeTriangulation is an implementation of a triangulation class based on the dual edge data structure*/

src/analysis/interpolation/HalfEdge.h

@@ -17,6 +17,8 @@
 #ifndef HALFEDGE_H
 #define HALFEDGE_H
 
+#include "qgis_analysis.h"
+
 /** \ingroup analysis
  * \class HalfEdge
  */

src/analysis/interpolation/LinTriangleInterpolator.h

@@ -19,6 +19,7 @@
 
 #include "TriangleInterpolator.h"
 #include "DualEdgeTriangulation.h"
+#include "qgis_analysis.h"
 
 /** \ingroup analysis
  * LinTriangleInterpolator is a class which interpolates linearly on a triangulation*/

src/analysis/interpolation/Line3D.h

@@ -18,6 +18,7 @@
 #define LINE3D_H
 
 #include "Node.h"
+#include "qgis_analysis.h"
 
 /** \ingroup analysis
  * This class represents a line. It is implemented as a single directed linked list of nodes (with related Point3D objects). Attention: the points inserted in a line are not deleted from Line3D*/

src/analysis/interpolation/MathUtils.h

@@ -18,6 +18,7 @@
 #define MATHUTILS_H
 
 #include <cmath>
+#include "qgis_analysis.h"
 
 class Point3D;
 class Vector3D;

src/analysis/interpolation/Node.h

@@ -18,6 +18,7 @@
 #define NODE_H
 
 #include "Point3D.h"
+#include "qgis_analysis.h"
 
 /** \ingroup analysis
  * Node is a class used by Line3D. It represents a node in the single directed linked list. Associated Point3D objects are deleted when the node is deleted.*/

src/analysis/interpolation/NormVecDecorator.h

@@ -21,6 +21,7 @@
 #include <TriangleInterpolator.h>
 #include <MathUtils.h>
 #include "qgslogger.h"
+#include "qgis_analysis.h"
 
 class QProgressDialog;
 

src/analysis/interpolation/ParametricLine.h

@@ -19,6 +19,7 @@
 
 #include "Point3D.h"
 #include <QVector>
+#include "qgis_analysis.h"
 
 class Vector3D;
 

src/analysis/interpolation/Point3D.h

@@ -18,6 +18,7 @@
 #define POINT3D_H
 
 #include <cmath>
+#include "qgis_analysis.h"
 
 /** \ingroup analysis
  * Point3D is a class to represent a three dimensional point*/

src/analysis/interpolation/TriDecorator.h

@@ -18,6 +18,7 @@
 #define TRIDECORATOR_H
 
 #include "Triangulation.h"
+#include "qgis_analysis.h"
 
 /** \ingroup analysis
  * Decorator class for Triangulations (s. Decorator pattern in Gamma et al.)*/

src/analysis/interpolation/TriangleInterpolator.h

@@ -19,6 +19,7 @@
 
 #include <Point3D.h>
 #include <Vector3D.h>
+#include "qgis_analysis.h"
 
 /** \ingroup analysis
  * This is an interface for interpolator classes for triangulations*/

src/analysis/interpolation/Triangulation.h

@@ -20,6 +20,7 @@
 #include <QList>
 #include <qpainter.h>
 #include <TriangleInterpolator.h>
+#include "qgis_analysis.h"
 
 class Line3D;
 

src/analysis/interpolation/Vector3D.h

@@ -18,6 +18,7 @@
 #define VECTOR3D_H
 
 #include <cmath>
+#include "qgis_analysis.h"
 
 /** \ingroup analysis
  * Class Vector3D represents a 3D-Vector, capable to store x-,y- and

src/analysis/interpolation/qgsgridfilewriter.h

@@ -21,6 +21,7 @@
 #include "qgsrectangle.h"
 #include <QString>
 #include <QTextStream>
+#include "qgis_analysis.h"
 
 class QgsInterpolator;
 

src/analysis/interpolation/qgsidwinterpolator.h

@@ -19,6 +19,7 @@
 #define QGSIDWINTERPOLATOR_H
 
 #include "qgsinterpolator.h"
+#include "qgis_analysis.h"
 
 /** \ingroup analysis
  * \class QgsIDWInterpolator

src/analysis/interpolation/qgsinterpolator.h

@@ -19,6 +19,7 @@
 #define QGSINTERPOLATOR_H
 
 #include <QVector>
+#include "qgis_analysis.h"
 
 class QgsVectorLayer;
 class QgsGeometry;

src/analysis/interpolation/qgstininterpolator.h

@@ -20,6 +20,7 @@
 
 #include "qgsinterpolator.h"
 #include <QString>
+#include "qgis_analysis.h"
 
 class Triangulation;
 class TriangleInterpolator;

src/analysis/network/qgsgraph.h

@@ -30,6 +30,7 @@
 #include <QVariant>
 
 #include "qgspoint.h"
+#include "qgis_analysis.h"
 
 class QgsGraphVertex;
 

src/analysis/network/qgsgraphanalyzer.h

@@ -17,6 +17,7 @@
 #define QGSGRAPHANALYZER_H
 
 #include <QVector>
+#include "qgis_analysis.h"
 
 class QgsGraph;
 

src/analysis/network/qgsgraphbuilder.h

@@ -19,6 +19,7 @@
 #include "qgsgraphbuilderinterface.h"
 
 #include <qgsspatialindex.h>
+#include "qgis_analysis.h"
 
 class QgsDistanceArea;
 class QgsCoordinateTransform;

src/analysis/network/qgsgraphbuilderinterface.h

@@ -22,6 +22,7 @@
 #include <qgspoint.h>
 #include <qgscoordinatereferencesystem.h>
 #include <qgsdistancearea.h>
+#include "qgis_analysis.h"
 
 /**
 * \ingroup analysis

src/analysis/network/qgsgraphdirector.h

@@ -22,6 +22,7 @@
 
 #include <qgspoint.h>
 #include "qgsnetworkstrategy.h"
+#include "qgis_analysis.h"
 
 class QgsGraphBuilderInterface;
 

src/analysis/network/qgsnetworkdistancestrategy.h

@@ -17,6 +17,7 @@
 #define QGSNETWORKDISTANCESTRATEGY_H
 
 #include <qgsnetworkstrategy.h>
+#include "qgis_analysis.h"
 
 /** \ingroup analysis
  * \class QgsNetworkDistanceStrategy

src/analysis/network/qgsnetworkspeedstrategy.h

@@ -17,6 +17,7 @@
 #define QGSNETWORKSPEEDSTRATEGY_H
 
 #include <qgsnetworkstrategy.h>
+#include "qgis_analysis.h"
 
 /** \ingroup analysis
  * \class QgsNetworkSpeedStrategy

src/analysis/network/qgsnetworkstrategy.h

@@ -20,6 +20,7 @@
 
 #include <qgsfeature.h>
 #include <qgsfeaturerequest.h>
+#include "qgis_analysis.h"
 
 /**
  * \ingroup analysis

src/analysis/network/qgsvectorlayerdirector.h

@@ -17,6 +17,7 @@
 #define QGSVECTORLAYERDIRECTOR_H
 
 #include "qgsgraphdirector.h"
+#include "qgis_analysis.h"
 
 class QgsGraphBuilderInterface;
 class QgsVectorLayer;

src/analysis/openstreetmap/qgsosmbase.h

@@ -20,6 +20,7 @@
 #include "qgspoint.h"
 
 #include <sqlite3.h>
+#include "qgis_analysis.h"
 
 typedef qint64 QgsOSMId;
 

src/analysis/openstreetmap/qgsosmdatabase.h

@@ -22,6 +22,7 @@
 #include "qgsosmbase.h"
 
 #include "qgsgeometry.h"
+#include "qgis_analysis.h"
 
 class QgsOSMNodeIterator;
 class QgsOSMWayIterator;

src/analysis/openstreetmap/qgsosmdownload.h

@@ -20,6 +20,7 @@
 #include <QObject>
 #include <QFile>
 #include <QNetworkReply>
+#include "qgis_analysis.h"
 
 class QgsRectangle;
 

src/analysis/openstreetmap/qgsosmimport.h

@@ -20,6 +20,7 @@
 #include <QObject>
 
 #include "qgsosmbase.h"
+#include "qgis_analysis.h"
 
 class QXmlStreamReader;
 

src/analysis/raster/qgsalignraster.h

@@ -21,6 +21,7 @@
 #include <QSizeF>
 #include <QString>
 #include <gdal_version.h>
+#include "qgis_analysis.h"
 
 class QgsRectangle;