Skip to content

Commit

Permalink
Add qgis_server with SERVER_EXPORT macro
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Jan 4, 2017
1 parent 38a8dda commit 1693140
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 5 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
13 changes: 9 additions & 4 deletions src/server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions src/server/qgsaccesscontrol.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "qgsaccesscontrolfilter.h"

#include <QMultiMap>
#include "qgis_server.h"

class QgsAccessControlPlugin;

Expand Down
1 change: 1 addition & 0 deletions src/server/qgsaccesscontrolfilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <QMultiMap>
#include <QList>
#include <QString>
#include "qgis_server.h"

class QgsServerInterface;
class QgsMapLayer;
Expand Down
1 change: 1 addition & 0 deletions src/server/qgscapabilitiescache.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions src/server/qgsconfigcache.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <QFileSystemWatcher>
#include <QMap>
#include <QObject>
#include "qgis_server.h"

class QgsServerProjectParser;
class QgsWCSProjectParser;
Expand Down
1 change: 1 addition & 0 deletions src/server/qgsmapserviceexception.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <QString>

#include "qgsexception.h"
#include "qgis_server.h"

/** \ingroup server
* \class QgsMapServiceException
Expand Down
1 change: 1 addition & 0 deletions src/server/qgsserver.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include "qgsserverplugins.h"
#include "qgsserverfilter.h"
#include "qgsserverinterfaceimpl.h"
#include "qgis_server.h"
#endif


Expand Down
1 change: 1 addition & 0 deletions src/server/qgsserverfilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#define QGSSERVERFILTER_H

#include <QMultiMap>
#include "qgis_server.h"

class QgsServerInterface;

Expand Down
1 change: 1 addition & 0 deletions src/server/qgsserverinterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "qgsserverfilter.h"
#include "qgsaccesscontrolfilter.h"
#include "qgsaccesscontrol.h"
#include "qgis_server.h"

/**
* \ingroup server
Expand Down
1 change: 1 addition & 0 deletions src/server/qgsserverplugins.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/server/qgsserverprojectparser.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <QHash>
#include <QMap>
#include <QString>
#include "qgis_server.h"

class QgsCoordinateReferenceSystem;
class QgsMapLayer;
Expand Down
1 change: 1 addition & 0 deletions src/server/qgswcsprojectparser.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#define QGSWCSPROJECTPARSER_H

#include "qgsserverprojectparser.h"
#include "qgis_server.h"

#ifdef HAVE_SERVER_PYTHON_PLUGINS
class QgsAccessControl;
Expand Down
1 change: 1 addition & 0 deletions src/server/qgswfsprojectparser.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#define QGSWFSPROJECTPARSER_H

#include "qgsserverprojectparser.h"
#include "qgis_server.h"


#ifdef HAVE_SERVER_PYTHON_PLUGINS
Expand Down
1 change: 1 addition & 0 deletions src/server/qgswmsconfigparser.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "qgsunittypes.h"
#include "qgspallabeling.h"
#include "qgsdatumtransformstore.h"
#include "qgis_server.h"

class QPainter;
class QDomDocument;
Expand Down
1 change: 1 addition & 0 deletions src/server/qgswmsprojectparser.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "qgswmsconfigparser.h"
#include "qgsserverprojectparser.h"
#include "qgslayertreegroup.h"
#include "qgis_server.h"

#ifdef HAVE_SERVER_PYTHON_PLUGINS
class QgsAccessControl;
Expand Down

0 comments on commit 1693140

Please sign in to comment.