Add qgis_gui.h with GUI_EXPORT macro

Author: m-kuhn

CMakeLists.txt

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

src/app/CMakeLists.txt

@@ -525,6 +525,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/../ui
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${QWT_INCLUDE_DIR}

src/auth/basic/CMakeLists.txt

@@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES (
   ../../core/auth
   ../../core/geometry
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${QCA_INCLUDE_DIR}

src/auth/identcert/CMakeLists.txt

@@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES (
   ../../core/auth
   ../../core/geometry
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${QCA_INCLUDE_DIR}

src/auth/pkipaths/CMakeLists.txt

@@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES (
   ../../core/auth
   ../../core/geometry
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${QCA_INCLUDE_DIR}

src/auth/pkipkcs12/CMakeLists.txt

@@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES (
   ../../core/auth
   ../../core/geometry
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
 )
 INCLUDE_DIRECTORIES (SYSTEM
   ${QCA_INCLUDE_DIR}

src/browser/CMakeLists.txt

@@ -66,6 +66,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/../ui
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${GEOS_INCLUDE_DIR}

src/gui/CMakeLists.txt

@@ -789,6 +789,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/layertree
   ${CMAKE_CURRENT_SOURCE_DIR}/effects
   ${CMAKE_BINARY_DIR}/src/core
+  ${CMAKE_BINARY_DIR}/src/gui
   ../core
   ../core/auth
   ../core/composer
@@ -810,9 +811,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${GDAL_INCLUDE_DIR}
 )
 
-REMOVE_DEFINITIONS("-DGUI_EXPORT=${DLLIMPORT}")
-ADD_DEFINITIONS("\"-DGUI_EXPORT=${DLLEXPORT}\"")
-
 # disable deprecation warnings for classes re-exporting deprecated methods
 IF(MSVC)
   SET_SOURCE_FILES_PROPERTIES(
@@ -869,6 +867,14 @@ TARGET_LINK_LIBRARIES(qgis_gui
   ${QSCINTILLA_LIBRARY}
 )
 
+GENERATE_EXPORT_HEADER(
+   qgis_gui
+   BASE_NAME GUI
+   EXPORT_FILE_NAME qgis_gui.h
+)
+
+SET(QGIS_GUI_HDRS ${QGIS_GUI_HDRS} ${PROJECT_BINARY_DIR}/qgis_gui.h)
+
 IF(WIN32)
   ADD_DEFINITIONS(-DQWT_DLL)
   ADD_DEFINITIONS(-DQSCINTILLA_DLL)

src/gui/attributetable/qgsattributetabledelegate.h

@@ -17,6 +17,7 @@
 #define QGSATTRIBUTETABLEDELEGATE_H
 
 #include <QItemDelegate>
+#include "qgis_gui.h"
 
 class QgsFeatureSelectionModel;
 class QPainter;

src/gui/attributetable/qgsattributetablefiltermodel.h

@@ -22,6 +22,7 @@
 
 #include "qgsattributetablemodel.h"
 #include "qgsfeaturemodel.h"
+#include "qgis_gui.h"
 
 class QgsVectorLayerCache;
 class QgsMapCanvas;