From 8b65ebdeca16ba1e4ca0e05c34bf9bb0a16b6791 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Fri, 28 Nov 2014 12:22:44 +0100
Subject: [PATCH] don't build server plugins if server isn't built

---
 CMakeLists.txt        | 12 +++++-------
 python/CMakeLists.txt | 18 ++++++++----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13a327f3a333..49ede5df3a5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,14 +44,12 @@ SET (WITH_DESKTOP TRUE CACHE BOOL "Determines whether QGIS desktop should be bui
 SET (WITH_MAPSERVER FALSE CACHE BOOL "Determines whether QGIS mapserver should be built")
 IF(WITH_MAPSERVER)
   SET (MAPSERVER_SKIP_ECW FALSE CACHE BOOL "Determines whether QGIS mapserver should disable ECW (ECW in server apps requires a special license)")
-ENDIF(WITH_MAPSERVER)
-
-
-SET (WITH_SERVER_PLUGINS TRUE CACHE BOOL "Determines whether QGIS mapserver support for python plugins should be built")
-IF(WITH_SERVER_PLUGINS)
-  SET(MAPSERVER_HAVE_PYTHON_PLUGINS TRUE)
-ENDIF(WITH_SERVER_PLUGINS)
 
+  SET (WITH_SERVER_PLUGINS TRUE CACHE BOOL "Determines whether QGIS mapserver support for python plugins should be built")
+  IF(WITH_SERVER_PLUGINS)
+    SET(MAPSERVER_HAVE_PYTHON_PLUGINS TRUE)
+  ENDIF(WITH_SERVER_PLUGINS)
+ENDIF(WITH_MAPSERVER)
 
 # Custom widgets
 SET (WITH_CUSTOM_WIDGETS FALSE CACHE BOOL "Determines whether QGIS custom widgets for Qt Designer should be built")
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index adee7e4a3ecf..92d0bfdbc5fe 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -166,23 +166,21 @@ ADD_SIP_PYTHON_MODULE(qgis._gui gui/gui.sip qgis_core qgis_gui)
 SET(PY_MODULES core gui analysis networkanalysis)
 
 # server module
-IF (WITH_SERVER_PLUGINS)
+IF (WITH_MAPSERVER AND WITH_SERVER_PLUGINS)
   INCLUDE_DIRECTORIES(
     ../src/mapserver
    ${CMAKE_BINARY_DIR}/src/mapserver
   )
 
-SET(PY_MODULES ${PY_MODULES} server)
+  SET(PY_MODULES ${PY_MODULES} server)
 
-FILE(GLOB sip_files_server
+  FILE(GLOB sip_files_server
     server/*.sip
-)
-SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_server})
-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.server.api)
-ADD_SIP_PYTHON_MODULE(qgis._server server/server.sip qgis_core qgis_server)
-
-ENDIF (WITH_SERVER_PLUGINS)
-
+  )
+  SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_server})
+  SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.server.api)
+  ADD_SIP_PYTHON_MODULE(qgis._server server/server.sip qgis_core qgis_server)
+ENDIF (WITH_MAPSERVER AND WITH_SERVER_PLUGINS)
 
 # additional analysis includes
 INCLUDE_DIRECTORIES(