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

missed sip include dir

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@12786 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
kyngchaos 2010-01-16 21:09:22 +00:00
parent 87f58d65d6
commit f84f71ee1e
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mac/xcode/Qgis.xcodeproj/project.pbxproj
View File

@ -16228,6 +16228,7 @@
../../src/core, ../../src/core,
../../src/core/spatialindex, ../../src/core/spatialindex,
"$(PYTHON_INC)", "$(PYTHON_INC)",
"$(SIP_INC)",
"$(GEOS_INC)", "$(GEOS_INC)",
); );
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)"; LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
@ -16260,6 +16261,7 @@
../../src/core, ../../src/core,
../../src/core/spatialindex, ../../src/core/spatialindex,
"$(PYTHON_INC)", "$(PYTHON_INC)",
"$(SIP_INC)",
"$(GEOS_INC)", "$(GEOS_INC)",
); );
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)"; LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
@ -16296,6 +16298,7 @@
../../src/core/symbology, ../../src/core/symbology,
"../../src/core/symbology-ng", "../../src/core/symbology-ng",
"$(PYTHON_INC)", "$(PYTHON_INC)",
"$(SIP_INC)",
"$(GDAL_INC)", "$(GDAL_INC)",
"$(GEOS_INC)", "$(GEOS_INC)",
); );
@ -16334,6 +16337,7 @@
../../src/core/symbology, ../../src/core/symbology,
"../../src/core/symbology-ng", "../../src/core/symbology-ng",
"$(PYTHON_INC)", "$(PYTHON_INC)",
"$(SIP_INC)",
"$(GDAL_INC)", "$(GDAL_INC)",
"$(GEOS_INC)", "$(GEOS_INC)",
); );
@ -16375,6 +16379,7 @@
../../src/core/symbology, ../../src/core/symbology,
"../../src/core/symbology-ng", "../../src/core/symbology-ng",
"$(PYTHON_INC)", "$(PYTHON_INC)",
"$(SIP_INC)",
"$(GDAL_INC)", "$(GDAL_INC)",
"$(GEOS_INC)", "$(GEOS_INC)",
); );
@ -16416,6 +16421,7 @@
../../src/core/symbology, ../../src/core/symbology,
"../../src/core/symbology-ng", "../../src/core/symbology-ng",
"$(PYTHON_INC)", "$(PYTHON_INC)",
"$(SIP_INC)",
"$(GDAL_INC)", "$(GDAL_INC)",
"$(GEOS_INC)", "$(GEOS_INC)",
); );

17
mac/xcode/ReadMe.rtf
View File

@ -215,13 +215,24 @@ See detailed dependency notes below.\
\f1\fs20 /Library/Frameworks \f1\fs20 /Library/Frameworks
\f0\fs24 install. But the system Python has a user location for Python modules, and programs should be installed elsewhere, like /usr/local/bin (follow the Qgis install instructions for SIP/PyQt).\ \f0\fs24 install. But the system Python has a user location for Python modules, and programs should be installed elsewhere, like /usr/local/bin (follow the Qgis install instructions for SIP/PyQt).\
\ \
PYQT_SIP_DIR and PYQT_SIP_FLAGS are set for a system SIP/PyQt install as described in INSTALL. They should be adjusted for other configurations. These can be found by starting Python (the desired Python for the Qgis build) in a Terminal, then:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\f1\fs20 \cf0 SIP_INC
\f0\fs24 ,
\f1\fs20 PYQT_SIP_DIR
\f0\fs24 and
\f1\fs20 PYQT_SIP_FLAGS
\f0\fs24 are set for a system SIP/PyQt install as described in INSTALL. They should be adjusted for other configurations. These can be found by starting Python (the desired Python for the Qgis build) in a Terminal, then:\
\ \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\f1\fs20 \cf0 import PyQt4.pyqtconfig\ \f1\fs20 \cf0 import sipconfig\
sipconfig.Configuration().sip_inc_dir\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\cf0 import PyQt4.pyqtconfig\
PyQt4.pyqtconfig.Configuration().pyqt_sip_dir\ PyQt4.pyqtconfig.Configuration().pyqt_sip_dir\
PyQt4.pyqtconfig.Configuration().pyqt_sip_flags\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\cf0 PyQt4.pyqtconfig.Configuration().pyqt_sip_flags\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\f0\fs24 \cf0 \ \f0\fs24 \cf0 \

2
mac/xcode/qgis_settings.xcconfig
View File

@ -42,6 +42,8 @@ QTLREL = $(QTBIN)/lrelease
SIP = $(PYTHON_USRBIN)/sip SIP = $(PYTHON_USRBIN)/sip
PYUIC4 = $(PYTHON_USRBIN)/pyuic4 PYUIC4 = $(PYTHON_USRBIN)/pyuic4
PYRCC4 = $(PYTHON_USRBIN)/pyrcc4 PYRCC4 = $(PYTHON_USRBIN)/pyrcc4
// from sipconfig.py
SIP_INC = /usr/local/include
// from pyqtconfig.py // from pyqtconfig.py
PYQT_SIP_DIR = /usr/local/share/sip/PyQt4 PYQT_SIP_DIR = /usr/local/share/sip/PyQt4
PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_4_5_0 -x Py_v3 -g PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_4_5_0 -x Py_v3 -g

1
mac/xcode/qgis_user-template.xcconfig
View File

@ -27,6 +27,7 @@
//QT_PLUGINS_DIR = /Developer/Applications/Qt/plugins //QT_PLUGINS_DIR = /Developer/Applications/Qt/plugins
//QTBIN = /Developer/Tools/Qt // bin dir //QTBIN = /Developer/Tools/Qt // bin dir
//SIP_INC = /usr/local/include
//PYQT_SIP_DIR = /usr/local/share/sip/PyQt4 //PYQT_SIP_DIR = /usr/local/share/sip/PyQt4
//PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_4_5_0 -x Py_v3 -g //PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_4_5_0 -x Py_v3 -g
//BISON = /usr/bin/bison // Tiger requires user-installed bison 2.3 //BISON = /usr/bin/bison // Tiger requires user-installed bison 2.3