Skip to content

Commit feb79a8

Browse files
luipirluipir
committedSep 7, 2013
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
·
ltr-3_40archive/master_2
2 parents 6b2fa67 + f66f9aa commit feb79a8

File tree

397 files changed

+53863
-38539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

397 files changed

+53863
-38539
lines changed
 

‎CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
2-
SET(CPACK_PACKAGE_VERSION_MINOR "9")
1+
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
2+
SET(CPACK_PACKAGE_VERSION_MINOR "1")
33
SET(CPACK_PACKAGE_VERSION_PATCH "0")
44
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
55
SET(RELEASE_NAME "Master")
@@ -86,7 +86,9 @@ IF (WITH_BINDINGS)
8686
SET (WITH_STAGED_PLUGINS TRUE CACHE BOOL "Stage-install core Python plugins to run from build directory? (utilities and console are always staged)")
8787
SET (WITH_PY_COMPILE FALSE CACHE BOOL "Determines whether Python modules in staged or installed locations are byte-compiled")
8888
# concatenate QScintilla2 API files
89-
SET (WITH_QSCIAPI TRUE CACHE BOOL "Determines whether the QScintilla2 API files will be updated and concatenated")
89+
SET (WITH_QSCIAPI TRUE CACHE BOOL "Whether to generate PyQGIS QScintilla2 API file. (For devs) run 'make qsci-pap-src' in between QGIS build and install to regenerate .pap file in source tree for console auto-completion.")
90+
# keep casual users from updating their source tree via WITH_QSCIAPI
91+
MARK_AS_ADVANCED (WITH_QSCIAPI)
9092
# path to custom Python framework on Mac
9193
IF (APPLE)
9294
SET (PYTHON_CUSTOM_FRAMEWORK "" CACHE PATH "Path to custom Python.framework on Mac. (should not have to specify other Python options)")
@@ -492,6 +494,7 @@ ADD_DEFINITIONS("-DCORE_EXPORT=${DLLIMPORT}")
492494
ADD_DEFINITIONS("-DGUI_EXPORT=${DLLIMPORT}")
493495
ADD_DEFINITIONS("-DPYTHON_EXPORT=${DLLIMPORT}")
494496
ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")
497+
ADD_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")
495498

496499
#############################################################
497500
# user-changeable settings which can be used to customize

‎cmake/QsciAPI.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
SET(QGIS_PYTHON_API_FILE "${CMAKE_BINARY_DIR}/python/qsci_apis/PyQGIS.api")
99

10+
# create empty destination api file
11+
FILE(WRITE "${QGIS_PYTHON_API_FILE}" "")
12+
1013
IF(EXISTS "${CMAKE_BINARY_DIR}/python/qgis.gui.api")
1114
FILE(READ "${CMAKE_BINARY_DIR}/python/qgis.gui.api" FILE_CONTENT)
1215
STRING(REGEX MATCHALL "gui\\.QgisInterface([^\n]+)" MATCHED_CONTENT "${FILE_CONTENT}")
@@ -16,6 +19,9 @@ IF(EXISTS "${CMAKE_BINARY_DIR}/python/qgis.gui.api")
1619
ENDFOREACH(matchedLine)
1720
ENDIF(EXISTS "${CMAKE_BINARY_DIR}/python/qgis.gui.api")
1821

22+
# add qgis.core.NULL attribute defined in <src>/python/__init__.py for QPyNullVariant
23+
FILE(APPEND "${QGIS_PYTHON_API_FILE}" "qgis.core.NULL?7\n")
24+
1925
FOREACH(apiFile qgis.core.api qgis.gui.api qgis.analysis.api qgis.networkanalysis.api)
2026
SET(api "${CMAKE_BINARY_DIR}/python/${apiFile}")
2127
IF(EXISTS "${api}")

0 commit comments

Comments
 (0)