qgis · Jan 4, 2017
diff --git a/‎CMakeLists.txt
Lines changed: 0 additions & 1 deletion b/‎CMakeLists.txt
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/app/CMakeLists.txt
Lines changed: 7 additions & 3 deletions b/‎src/app/CMakeLists.txt
Lines changed: 7 additions & 3 deletions
@@ -581,7 +581,6 @@ ELSE (WIN32)
 
 ENDIF(WIN32)
 
-ADD_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DCUSTOMWIDGETS_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DSERVER_EXPORT=${DLLIMPORT}")
 
 
@@ -528,6 +528,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_BINARY_DIR}/src/gui
   ${CMAKE_BINARY_DIR}/src/python
   ${CMAKE_BINARY_DIR}/src/analysis
+  ${CMAKE_BINARY_DIR}/src/app
 )
 INCLUDE_DIRECTORIES(SYSTEM
   ${QWT_INCLUDE_DIR}
@@ -591,9 +592,6 @@ ELSE (ANDROID)
   ADD_EXECUTABLE(${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 ${QGIS_APPMAIN_SRCS} ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
 ENDIF (ANDROID)
 
-REMOVE_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")
-ADD_DEFINITIONS("\"-DAPP_EXPORT=${DLLEXPORT}\"")
-
 # Putting IMAGE_RCC_SRCS into qgis_app lib is causing problems when the lib is
 # loaded (by plugin for example) in test unit (qgis_composerpicturetest).
 ADD_LIBRARY(qgis_app SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS})
@@ -613,6 +611,12 @@ TARGET_LINK_LIBRARIES(qgis_app
   libdxfrw
 )
 
+GENERATE_EXPORT_HEADER(
+   qgis_app
+   BASE_NAME APP
+   EXPORT_FILE_NAME qgis_app.h
+)
+
 IF (NOT ANDROID)
   SET_TARGET_PROPERTIES(qgis_app PROPERTIES
     VERSION ${COMPLETE_VERSION}