Add qgis_server with SERVER_EXPORT macro

qgis · Jan 4, 2017 · 1693140 · 1693140
1 parent 38a8dda
commit 1693140
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -582,7 +582,6 @@ ELSE (WIN32)
 ENDIF(WIN32)
 
 ADD_DEFINITIONS("-DCUSTOMWIDGETS_EXPORT=${DLLIMPORT}")
-ADD_DEFINITIONS("-DSERVER_EXPORT=${DLLIMPORT}")
 
 SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
 INCLUDE(GenerateExportHeader)

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -101,10 +101,6 @@ SET(qgis_mapserv_SRCS ${qgis_mapserv_SRCS}
 )
 ENDIF (WITH_SERVER_PLUGINS)
 
-REMOVE_DEFINITIONS("-DSERVER_EXPORT=${DLLIMPORT}")
-ADD_DEFINITIONS("\"-DSERVER_EXPORT=${DLLEXPORT}\"")
-
-
 QT5_WRAP_CPP(qgis_mapserv_MOC_SRCS ${qgis_mapserv_MOC_HDRS})
 
 IF(MSVC)
@@ -198,6 +194,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_BINARY_DIR}/src/gui
   ${CMAKE_BINARY_DIR}/src/python
   ${CMAKE_BINARY_DIR}/src/analysis
+  ${CMAKE_BINARY_DIR}/src/server
   ../core
   ../core/auth
   ../core/dxf
@@ -225,6 +222,14 @@ TARGET_LINK_LIBRARIES(qgis_mapserv.fcgi
   ${QCA_LIBRARY}
 )
 
+GENERATE_EXPORT_HEADER(
+   qgis_server
+   BASE_NAME SERVER
+   EXPORT_FILE_NAME qgis_server.h
+ )
+
+SET(QGIS_SERVER_HDRS ${QGIS_SERVER_HDRS} ${PROJECT_BINARY_DIR}/qgis_server.h)
+
 ########################################################
 # Install
 

diff --git a/src/server/qgsaccesscontrol.h b/src/server/qgsaccesscontrol.h
@@ -22,6 +22,7 @@
 #include "qgsaccesscontrolfilter.h"
 
 #include <QMultiMap>
+#include "qgis_server.h"
 
 class QgsAccessControlPlugin;
 

diff --git a/src/server/qgsaccesscontrolfilter.h b/src/server/qgsaccesscontrolfilter.h
@@ -23,6 +23,7 @@
 #include <QMultiMap>
 #include <QList>
 #include <QString>
+#include "qgis_server.h"
 
 class QgsServerInterface;
 class QgsMapLayer;

diff --git a/src/server/qgscapabilitiescache.h b/src/server/qgscapabilitiescache.h
@@ -22,6 +22,7 @@
 #include <QFileSystemWatcher>
 #include <QHash>
 #include <QObject>
+#include "qgis_server.h"
 
 /** \ingroup server
  * A cache for capabilities xml documents (by configuration file path)

diff --git a/src/server/qgsconfigcache.h b/src/server/qgsconfigcache.h
@@ -24,6 +24,7 @@
 #include <QFileSystemWatcher>
 #include <QMap>
 #include <QObject>
+#include "qgis_server.h"
 
 class QgsServerProjectParser;
 class QgsWCSProjectParser;

diff --git a/src/server/qgsmapserviceexception.h b/src/server/qgsmapserviceexception.h
@@ -21,6 +21,7 @@
 #include <QString>
 
 #include "qgsexception.h"
+#include "qgis_server.h"
 
 /** \ingroup server
  * \class  QgsMapServiceException

diff --git a/src/server/qgsserver.h b/src/server/qgsserver.h
@@ -39,6 +39,7 @@
 #include "qgsserverplugins.h"
 #include "qgsserverfilter.h"
 #include "qgsserverinterfaceimpl.h"
+#include "qgis_server.h"
 #endif
 
 

diff --git a/src/server/qgsserverfilter.h b/src/server/qgsserverfilter.h
@@ -21,6 +21,7 @@
 #define QGSSERVERFILTER_H
 
 #include <QMultiMap>
+#include "qgis_server.h"
 
 class QgsServerInterface;
 

diff --git a/src/server/qgsserverinterface.h b/src/server/qgsserverinterface.h
@@ -26,6 +26,7 @@
 #include "qgsserverfilter.h"
 #include "qgsaccesscontrolfilter.h"
 #include "qgsaccesscontrol.h"
+#include "qgis_server.h"
 
 /**
  * \ingroup server

diff --git a/src/server/qgsserverplugins.h b/src/server/qgsserverplugins.h
@@ -20,6 +20,7 @@
 
 #include "qgsrequesthandler.h"
 #include "qgsserverinterface.h"
+#include "qgis_server.h"
 
 // This is needed by SIP otherwise it doesn't find QgsPythonUtils header
 class QgsPythonUtils;

diff --git a/src/server/qgsserverprojectparser.h b/src/server/qgsserverprojectparser.h
@@ -26,6 +26,7 @@
 #include <QHash>
 #include <QMap>
 #include <QString>
+#include "qgis_server.h"
 
 class QgsCoordinateReferenceSystem;
 class QgsMapLayer;

diff --git a/src/server/qgswcsprojectparser.h b/src/server/qgswcsprojectparser.h
@@ -19,6 +19,7 @@
 #define QGSWCSPROJECTPARSER_H
 
 #include "qgsserverprojectparser.h"
+#include "qgis_server.h"
 
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
 class QgsAccessControl;

diff --git a/src/server/qgswfsprojectparser.h b/src/server/qgswfsprojectparser.h
@@ -19,6 +19,7 @@
 #define QGSWFSPROJECTPARSER_H
 
 #include "qgsserverprojectparser.h"
+#include "qgis_server.h"
 
 
 #ifdef HAVE_SERVER_PYTHON_PLUGINS

diff --git a/src/server/qgswmsconfigparser.h b/src/server/qgswmsconfigparser.h
@@ -21,6 +21,7 @@
 #include "qgsunittypes.h"
 #include "qgspallabeling.h"
 #include "qgsdatumtransformstore.h"
+#include "qgis_server.h"
 
 class QPainter;
 class QDomDocument;

diff --git a/src/server/qgswmsprojectparser.h b/src/server/qgswmsprojectparser.h
@@ -21,6 +21,7 @@
 #include "qgswmsconfigparser.h"
 #include "qgsserverprojectparser.h"
 #include "qgslayertreegroup.h"
+#include "qgis_server.h"
 
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
 class QgsAccessControl;