File tree Expand file tree Collapse file tree 2 files changed +13
-17
lines changed Expand file tree Collapse file tree 2 files changed +13
-17
lines changed Original file line number Diff line number Diff line change @@ -44,14 +44,12 @@ SET (WITH_DESKTOP TRUE CACHE BOOL "Determines whether QGIS desktop should be bui
44
44
SET (WITH_MAPSERVER FALSE CACHE BOOL "Determines whether QGIS mapserver should be built" )
45
45
IF (WITH_MAPSERVER )
46
46
SET (MAPSERVER_SKIP_ECW FALSE CACHE BOOL "Determines whether QGIS mapserver should disable ECW (ECW in server apps requires a special license)" )
47
- ENDIF (WITH_MAPSERVER )
48
-
49
-
50
- SET (WITH_SERVER_PLUGINS TRUE CACHE BOOL "Determines whether QGIS mapserver support for python plugins should be built" )
51
- IF (WITH_SERVER_PLUGINS )
52
- SET (MAPSERVER_HAVE_PYTHON_PLUGINS TRUE )
53
- ENDIF (WITH_SERVER_PLUGINS )
54
47
48
+ SET (WITH_SERVER_PLUGINS TRUE CACHE BOOL "Determines whether QGIS mapserver support for python plugins should be built" )
49
+ IF (WITH_SERVER_PLUGINS )
50
+ SET (MAPSERVER_HAVE_PYTHON_PLUGINS TRUE )
51
+ ENDIF (WITH_SERVER_PLUGINS )
52
+ ENDIF (WITH_MAPSERVER )
55
53
56
54
# Custom widgets
57
55
SET (WITH_CUSTOM_WIDGETS FALSE CACHE BOOL "Determines whether QGIS custom widgets for Qt Designer should be built" )
Original file line number Diff line number Diff line change @@ -166,23 +166,21 @@ ADD_SIP_PYTHON_MODULE(qgis._gui gui/gui.sip qgis_core qgis_gui)
166
166
SET (PY_MODULES core gui analysis networkanalysis )
167
167
168
168
# server module
169
- IF (WITH_SERVER_PLUGINS )
169
+ IF (WITH_MAPSERVER AND WITH_SERVER_PLUGINS )
170
170
INCLUDE_DIRECTORIES (
171
171
../src/mapserver
172
172
${CMAKE_BINARY_DIR} /src/mapserver
173
173
)
174
174
175
- SET (PY_MODULES ${PY_MODULES} server )
175
+ SET (PY_MODULES ${PY_MODULES} server )
176
176
177
- FILE (GLOB sip_files_server
177
+ FILE (GLOB sip_files_server
178
178
server/*.sip
179
- )
180
- SET (SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_server} )
181
- SET (SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR} /python/qgis.server.api )
182
- ADD_SIP_PYTHON_MODULE (qgis._server server/server.sip qgis_core qgis_server )
183
-
184
- ENDIF (WITH_SERVER_PLUGINS )
185
-
179
+ )
180
+ SET (SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_server} )
181
+ SET (SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR} /python/qgis.server.api )
182
+ ADD_SIP_PYTHON_MODULE (qgis._server server/server.sip qgis_core qgis_server )
183
+ ENDIF (WITH_MAPSERVER AND WITH_SERVER_PLUGINS )
186
184
187
185
# additional analysis includes
188
186
INCLUDE_DIRECTORIES (
You can’t perform that action at this time.
0 commit comments