Skip to content

Commit f84f71e

Browse files
author
kyngchaos
committed
missed sip include dir
git-svn-id: http://svn.osgeo.org/qgis/trunk@12786 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 87f58d6 commit f84f71e

File tree

4 files changed

+23
-3
lines changed

4 files changed

+23
-3
lines changed

mac/xcode/Qgis.xcodeproj/project.pbxproj

+6
Original file line numberDiff line numberDiff line change
@@ -16228,6 +16228,7 @@
1622816228
../../src/core,
1622916229
../../src/core/spatialindex,
1623016230
"$(PYTHON_INC)",
16231+
"$(SIP_INC)",
1623116232
"$(GEOS_INC)",
1623216233
);
1623316234
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
@@ -16260,6 +16261,7 @@
1626016261
../../src/core,
1626116262
../../src/core/spatialindex,
1626216263
"$(PYTHON_INC)",
16264+
"$(SIP_INC)",
1626316265
"$(GEOS_INC)",
1626416266
);
1626516267
LIBRARY_SEARCH_PATHS = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIB_SUBDIR)";
@@ -16296,6 +16298,7 @@
1629616298
../../src/core/symbology,
1629716299
"../../src/core/symbology-ng",
1629816300
"$(PYTHON_INC)",
16301+
"$(SIP_INC)",
1629916302
"$(GDAL_INC)",
1630016303
"$(GEOS_INC)",
1630116304
);
@@ -16334,6 +16337,7 @@
1633416337
../../src/core/symbology,
1633516338
"../../src/core/symbology-ng",
1633616339
"$(PYTHON_INC)",
16340+
"$(SIP_INC)",
1633716341
"$(GDAL_INC)",
1633816342
"$(GEOS_INC)",
1633916343
);
@@ -16375,6 +16379,7 @@
1637516379
../../src/core/symbology,
1637616380
"../../src/core/symbology-ng",
1637716381
"$(PYTHON_INC)",
16382+
"$(SIP_INC)",
1637816383
"$(GDAL_INC)",
1637916384
"$(GEOS_INC)",
1638016385
);
@@ -16416,6 +16421,7 @@
1641616421
../../src/core/symbology,
1641716422
"../../src/core/symbology-ng",
1641816423
"$(PYTHON_INC)",
16424+
"$(SIP_INC)",
1641916425
"$(GDAL_INC)",
1642016426
"$(GEOS_INC)",
1642116427
);

mac/xcode/ReadMe.rtf

+14-3
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,24 @@ See detailed dependency notes below.\
215215
\f1\fs20 /Library/Frameworks
216216
\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).\
217217
\
218-
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:\
218+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
219+
220+
\f1\fs20 \cf0 SIP_INC
221+
\f0\fs24 ,
222+
\f1\fs20 PYQT_SIP_DIR
223+
\f0\fs24 and
224+
\f1\fs20 PYQT_SIP_FLAGS
225+
\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:\
219226
\
220227
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
221228

222-
\f1\fs20 \cf0 import PyQt4.pyqtconfig\
229+
\f1\fs20 \cf0 import sipconfig\
230+
sipconfig.Configuration().sip_inc_dir\
231+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
232+
\cf0 import PyQt4.pyqtconfig\
223233
PyQt4.pyqtconfig.Configuration().pyqt_sip_dir\
224-
PyQt4.pyqtconfig.Configuration().pyqt_sip_flags\
234+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
235+
\cf0 PyQt4.pyqtconfig.Configuration().pyqt_sip_flags\
225236
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
226237

227238
\f0\fs24 \cf0 \

mac/xcode/qgis_settings.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ QTLREL = $(QTBIN)/lrelease
4242
SIP = $(PYTHON_USRBIN)/sip
4343
PYUIC4 = $(PYTHON_USRBIN)/pyuic4
4444
PYRCC4 = $(PYTHON_USRBIN)/pyrcc4
45+
// from sipconfig.py
46+
SIP_INC = /usr/local/include
4547
// from pyqtconfig.py
4648
PYQT_SIP_DIR = /usr/local/share/sip/PyQt4
4749
PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_4_5_0 -x Py_v3 -g

mac/xcode/qgis_user-template.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
//QT_PLUGINS_DIR = /Developer/Applications/Qt/plugins
2929
//QTBIN = /Developer/Tools/Qt // bin dir
30+
//SIP_INC = /usr/local/include
3031
//PYQT_SIP_DIR = /usr/local/share/sip/PyQt4
3132
//PYQT_SIP_FLAGS = -x VendorID -t WS_MACX -x PyQt_NoPrintRangeBug -t Qt_4_5_0 -x Py_v3 -g
3233
//BISON = /usr/bin/bison // Tiger requires user-installed bison 2.3

0 commit comments

Comments
 (0)