fix building server without plugins (or without python) (#40869)

qgis · Jan 7, 2021 · 0f68ad8 · 0f68ad8
1 parent eedbd3b
commit 0f68ad8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/python/server/server_auto.sip b/python/server/server_auto.sip
@@ -19,6 +19,9 @@
 %Include auto_generated/qgsserverapiutils.sip
 %Include auto_generated/qgsserverexception.sip
 %If ( HAVE_SERVER_PYTHON_PLUGINS )
+%Include auto_generated/qgsserverfilter.sip
+%End
+%If ( HAVE_SERVER_PYTHON_PLUGINS )
 %Include auto_generated/qgsserverinterface.sip
 %End
 %Include auto_generated/qgsserverprojectutils.sip
@@ -30,9 +33,6 @@
 %Include auto_generated/qgsfeaturefilter.sip
 %Include auto_generated/qgsstorebadlayerinfo.sip
 %If ( HAVE_SERVER_PYTHON_PLUGINS )
-%Include auto_generated/qgsserverfilter.sip
-%End
-%If ( HAVE_SERVER_PYTHON_PLUGINS )
 %Include auto_generated/qgsaccesscontrolfilter.sip
 %End
 %If ( HAVE_SERVER_PYTHON_PLUGINS )

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -34,6 +34,7 @@ set(QGIS_SERVER_SRCS
   qgsserverapicontext.cpp
   qgsserverparameters.cpp
   qgsserverexception.cpp
+  qgsserverfilter.cpp
   qgsserverinterface.cpp
   qgsserverinterfaceimpl.cpp
   qgsserverlogger.cpp
@@ -74,7 +75,6 @@ set (QGIS_SERVER_HDRS
 if (WITH_SERVER_PLUGINS)
   set(QGIS_SERVER_SRCS ${QGIS_SERVER_SRCS}
     qgsserverplugins.cpp
-    qgsserverfilter.cpp
     qgsaccesscontrolfilter.cpp
     qgsaccesscontrol.cpp
     qgsservercachefilter.cpp