File tree Expand file tree Collapse file tree 3 files changed +10
-14
lines changed Expand file tree Collapse file tree 3 files changed +10
-14
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ ENDIF(EXISTS "${CMAKE_BINARY_DIR}/python/qgis.gui.api")
22
22
# add qgis.core.NULL attribute defined in <src>/python/__init__.py for QPyNullVariant
23
23
FILE (APPEND "${QGIS_PYTHON_API_FILE} " "qgis.core.NULL?7\n " )
24
24
25
- FOREACH (apiFile qgis.core.api qgis.gui.api qgis.analysis.api qgis.server.api )
25
+ FOREACH (apiFile qgis.core.api qgis.gui.api qgis.analysis.api qgis.server.api qgis.qgis3d.api )
26
26
SET (api "${CMAKE_BINARY_DIR} /python/${apiFile} " )
27
27
IF (EXISTS "${api} " )
28
28
FILE (READ "${api} " FILE_CONTENT )
Original file line number Diff line number Diff line change @@ -142,17 +142,6 @@ IF (WITH_GUI)
142
142
)
143
143
ENDIF ()
144
144
145
- IF (WITH_3D )
146
- INCLUDE_DIRECTORIES (
147
- ${CMAKE_SOURCE_DIR} /src/3d
148
- ${CMAKE_SOURCE_DIR} /src/3d/chunks
149
- ${CMAKE_SOURCE_DIR} /src/3d/symbols
150
- ${CMAKE_SOURCE_DIR} /src/3d/terrain
151
-
152
- ${CMAKE_BINARY_DIR} /src/3d
153
- )
154
- ENDIF ()
155
-
156
145
IF (NOT ENABLE_TESTS )
157
146
SET (SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} TESTS )
158
147
ENDIF (NOT ENABLE_TESTS )
@@ -232,6 +221,13 @@ ENDIF (WITH_GUI)
232
221
233
222
# 3D module
234
223
IF (WITH_3D )
224
+ INCLUDE_DIRECTORIES (
225
+ ${CMAKE_SOURCE_DIR} /src/3d
226
+ ${CMAKE_SOURCE_DIR} /src/3d/chunks
227
+ ${CMAKE_SOURCE_DIR} /src/3d/symbols
228
+ ${CMAKE_SOURCE_DIR} /src/3d/terrain
229
+ ${CMAKE_BINARY_DIR} /src/3d
230
+ )
235
231
SET (PY_MODULES ${PY_MODULES} 3d )
236
232
237
233
FILE (GLOB_RECURSE sip_files_3d 3d/*.sip 3d/*.sip.in )
@@ -309,7 +305,7 @@ IF(WITH_QSCIAPI)
309
305
SET (QGIS_PYTHON_API_FILE "${CMAKE_BINARY_DIR} /python/qsci_apis/PyQGIS.api" )
310
306
311
307
ADD_CUSTOM_TARGET (qsci-api ALL
312
- DEPENDS python_module_qgis__gui python_module_qgis__core python_module_qgis__analysis )
308
+ DEPENDS python_module_qgis__gui python_module_qgis__core python_module_qgis__analysis python_module_qgis__server python_module_qgis__3d )
313
309
314
310
# run update/concatenate command
315
311
ADD_CUSTOM_COMMAND (TARGET qsci-api
Original file line number Diff line number Diff line change @@ -71,7 +71,7 @@ def prepareAPI(self):
71
71
72
72
if __name__ == '__main__' :
73
73
if len (sys .argv ) != 4 :
74
- print 'Usage: python <script> <pap_file> <apis_src_dir> <api_bin_dir>'
74
+ print ( 'Usage: python <script> <pap_file> <apis_src_dir> <api_bin_dir>' )
75
75
sys .exit (1 )
76
76
pap_file = sys .argv [1 ]
77
77
api_src_dir = sys .argv [2 ]
You can’t perform that action at this time.
0 commit comments