sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

add 3d module to API file

Browse Source
This commit is contained in:
Salvatore Larosa 2018-10-16 12:52:48 +02:00
parent 4cc4bab969
commit 20c9a5da33
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QsciAPI.cmake
View File

@ -22,7 +22,7 @@ ENDIF(EXISTS "${CMAKE_BINARY_DIR}/python/qgis.gui.api")
# add qgis.core.NULL attribute defined in <src>/python/__init__.py for QPyNullVariant # add qgis.core.NULL attribute defined in <src>/python/__init__.py for QPyNullVariant
FILE(APPEND "${QGIS_PYTHON_API_FILE}" "qgis.core.NULL?7\n") FILE(APPEND "${QGIS_PYTHON_API_FILE}" "qgis.core.NULL?7\n")
FOREACH(apiFile qgis.core.api qgis.gui.api qgis.analysis.api qgis.server.api) FOREACH(apiFile qgis.core.api qgis.gui.api qgis.analysis.api qgis.server.api qgis.qgis3d.api)
SET(api "${CMAKE_BINARY_DIR}/python/${apiFile}") SET(api "${CMAKE_BINARY_DIR}/python/${apiFile}")
IF(EXISTS "${api}") IF(EXISTS "${api}")
FILE(READ "${api}" FILE_CONTENT) FILE(READ "${api}" FILE_CONTENT)

20
python/CMakeLists.txt
View File

@ -142,17 +142,6 @@ IF (WITH_GUI)
) )
ENDIF () ENDIF ()
IF (WITH_3D)
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/3d
${CMAKE_SOURCE_DIR}/src/3d/chunks
${CMAKE_SOURCE_DIR}/src/3d/symbols
${CMAKE_SOURCE_DIR}/src/3d/terrain
${CMAKE_BINARY_DIR}/src/3d
)
ENDIF ()
IF(NOT ENABLE_TESTS) IF(NOT ENABLE_TESTS)
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} TESTS) SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} TESTS)
ENDIF(NOT ENABLE_TESTS) ENDIF(NOT ENABLE_TESTS)
@ -232,6 +221,13 @@ ENDIF (WITH_GUI)
# 3D module # 3D module
IF (WITH_3D) IF (WITH_3D)
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/3d
${CMAKE_SOURCE_DIR}/src/3d/chunks
${CMAKE_SOURCE_DIR}/src/3d/symbols
${CMAKE_SOURCE_DIR}/src/3d/terrain
${CMAKE_BINARY_DIR}/src/3d
)
SET(PY_MODULES ${PY_MODULES} 3d) SET(PY_MODULES ${PY_MODULES} 3d)
FILE(GLOB_RECURSE sip_files_3d 3d/*.sip 3d/*.sip.in) FILE(GLOB_RECURSE sip_files_3d 3d/*.sip 3d/*.sip.in)
@ -309,7 +305,7 @@ IF(WITH_QSCIAPI)
SET(QGIS_PYTHON_API_FILE "${CMAKE_BINARY_DIR}/python/qsci_apis/PyQGIS.api") SET(QGIS_PYTHON_API_FILE "${CMAKE_BINARY_DIR}/python/qsci_apis/PyQGIS.api")
ADD_CUSTOM_TARGET(qsci-api ALL ADD_CUSTOM_TARGET(qsci-api ALL
DEPENDS python_module_qgis__gui python_module_qgis__core python_module_qgis__analysis) DEPENDS python_module_qgis__gui python_module_qgis__core python_module_qgis__analysis python_module_qgis__server python_module_qgis__3d)
# run update/concatenate command # run update/concatenate command
ADD_CUSTOM_COMMAND(TARGET qsci-api ADD_CUSTOM_COMMAND(TARGET qsci-api

2
python/qsci_apis/generate_console_pap.py
View File

@ -71,7 +71,7 @@ class PrepareAPIs(QObject):
if __name__ == '__main__': if __name__ == '__main__':
if len(sys.argv) != 4: if len(sys.argv) != 4:
print 'Usage: python <script> <pap_file> <apis_src_dir> <api_bin_dir>' print('Usage: python <script> <pap_file> <apis_src_dir> <api_bin_dir>')
sys.exit(1) sys.exit(1)
pap_file = sys.argv[1] pap_file = sys.argv[1]
api_src_dir = sys.argv[2] api_src_dir = sys.argv[2]