Skip to content

Commit 3f79cba

Browse files
author
kyngchaos
committedJan 9, 2010
move pg and ogr stuff (r12702)
add GPS tracking and Qwt (r12685, r12692, r12707) composer table select display attribs (r12709) another composer table update (r12717) misc updates phwew! note: qwt not optional for xcode project due to lack of conditional sources git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12724 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 8821edc commit 3f79cba

File tree

4 files changed

+341
-27
lines changed

4 files changed

+341
-27
lines changed
 

‎mac/xcode/Qgis.xcodeproj/project.pbxproj

Lines changed: 309 additions & 24 deletions
Large diffs are not rendered by default.

‎mac/xcode/ReadMe.rtf

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
\b0\fs24 \cf0 \
1111
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
1212

13-
\i \cf0 2.3.0 2009-12-28\
13+
\i \cf0 2.4.0 2010-1-9\
1414
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
1515
1616
\i0 \cf0 \
@@ -67,6 +67,8 @@ See the Qgis {\field{\*\fldinst{HYPERLINK "http://wiki.qgis.org/qgiswiki/Buildin
6767
\
6868
\ul SIP\ulnone and \ul PyQt\ulnone - make sure that they fully support the installed Qt version. Development versions may cause trouble for QGIS. See the QGIS install instructions for info about how to compile and install these.\
6969
\
70+
\ul [Py]Qwt\ulnone - Qwt needed for GPS tracking function. PyQwt used for some 3rd-party plugins. Since PyQwt installs inside PyQt, it must be bundled along with PyQt. The PyQwt sources can be used, but extra steps are needed to compile Qwt and PyQwt separately.\
71+
\
7072
\
7173
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
7274

@@ -201,7 +203,7 @@ See detailed dependency notes below.\
201203
\f1\fs20 static
202204
\f0\fs24 forms in the settings.\
203205
\
204-
- GRASS - GRASS.app \ul must\ulnone be installed as it was built. If it was moved or renamed after installation, GRASS support in Qgis won't work. This goes for building Qgis as well as running it to use full GRASS support.\
206+
- GRASS - GRASS.app \ul must\ulnone be installed as it was built. If it was moved or renamed after installation, GRASS support in Qgis won't work. This goes for building Qgis as well as running it to use full GRASS support. Also, make sure to set the GRASS version in the config, as this is not detectable.\
205207
\
206208
- Python/SIP/PyQt - this is a complex installation. Python can be either in the system or separately installed in
207209
\f1\fs20 /Library/Frameworks
@@ -213,6 +215,8 @@ SIP/PyQt programs are found with the
213215
\f1\fs20 PYTHON_USRBIN
214216
\f0\fs24 setting. This is automatic if you follow the Qgis SIP/PyQt install instructions.\
215217
\
218+
- Qwt/PyQwt - Qwt version must be set.\
219+
\
216220
\
217221
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
218222

‎mac/xcode/qgis_settings.xcconfig

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// QGIS Xcode project common build settings
22

3-
CURRENT_PROJECT_VERSION = 2.3.0
3+
CURRENT_PROJECT_VERSION = 2.4.0
44

55
// SDKSYS must be set to valid value
66
SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
@@ -81,6 +81,10 @@ GRASS_VERSION = 6.4
8181
PYTHON_FORM = $(PYTHON_FORM_$(SDKSYS)) // fw, system or disabled
8282
PYTHON_VERSION = $(PYTHON_VERSION_$(SDKSYS))
8383

84+
// qwt can't be compiled into pyqwt as is the default with pyqwt
85+
QWT_FORM = shared // shared or static
86+
QWT_VERSION = 5.2.1-svn // default in pyqwt package
87+
8488
//////////////////////////////////////////////////////////////////////
8589
// whether to bundle some external libs in the app package
8690
// some checking is done, so /Library frameworks (except Qt) and
@@ -93,6 +97,8 @@ PYTHON_VERSION = $(PYTHON_VERSION_$(SDKSYS))
9397

9498
BUNDLE_PGSQL = YES
9599
BUNDLE_GPSBABEL = YES
100+
BUNDLE_QWT = YES
101+
96102
// frameworks not bundled
97103
BUNDLE_GSL = YES
98104
BUNDLE_GDAL = YES
@@ -130,6 +136,9 @@ PGSQL_PREFIX = /usr/local/pgsql
130136
// used to link static libs, defaults based on kyngchaos dist
131137
PGSQL_LIBADD = -lintl -framework CoreFoundation -liconv -lxml2 -lssl -lcrypto -lpam -lkrb5 -lldap -lz
132138

139+
QWT_PREFIX_shared = /usr/local/qwt-$(QWT_VERSION)
140+
QWT_PREFIX_static = $(QWT_PREFIX_shared)
141+
133142
//////////////////////////////////////////////////////////////////////
134143
// DO NOT CHANGE THESE
135144
//////////////////////////////////////////////////////////////////////
@@ -331,6 +340,11 @@ SPATIALITE_INC = $(SPATIALITE_INC_$(SQLITE_FORM))
331340
SPATIALITE_LIBADD_internal = -liconv -ldl
332341
SPATIALITE_LIBADD = $(SPATIALITE_GEOS_$(SPATIALITE_GEOS)_$(SQLITE_FORM)) $(SPATIALITE_PROJ_$(SPATIALITE_PROJ)_$(SQLITE_FORM)) $(SPATIALITE_LIBADD_$(SQLITE_FORM))
333342

343+
QWT_PREFIX = $(QWT_PREFIX_$(QWT_FORM))
344+
QWT_INC = $(QWT_PREFIX)/include
345+
QWT_LIB = -L$(QWT_PREFIX)/lib -lqwt
346+
QWT_DEFS = HAVE_QWT
347+
334348
// defaults by system
335349
PYTHON_VERSION_tig = 2.5
336350
PYTHON_VERSION_leo = 2.5

‎mac/xcode/qgis_user-template.xcconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@
6565
//PYTHON_FORM = $(PYTHON_FORM_$(SDKSYS)) // fw, system or disabled
6666
//PYTHON_VERSION = $(PYTHON_VERSION_$(SDKSYS))
6767

68+
// qwt can't be compiled into pyqwt as is the default with pyqwt
69+
//QWT_FORM = shared // shared or static
70+
//QWT_VERSION = 5.2.1-svn // default in pyqwt package
71+
6872
//////////////////////////////////////////////////////////////////////
6973
// whether to bundle some external libs in the app package
7074
// some checking is done, so /Library frameworks (except Qt) and
@@ -74,6 +78,7 @@
7478

7579
//BUNDLE_PGSQL = YES
7680
//BUNDLE_GPSBABEL = YES
81+
//BUNDLE_QWT = YES
7782

7883
// frameworks not bundled
7984
//BUNDLE_GSL = YES
@@ -119,6 +124,9 @@
119124
// used to link static libs, defaults based on kyngchaos dist
120125
//PGSQL_LIBADD = -lintl -framework CoreFoundation -liconv -lxml2 -lssl -lcrypto -lpam -lkrb5 -lldap -lz
121126

127+
//QWT_PREFIX_shared = /usr/local/qwt-$(QWT_VERSION)
128+
//QWT_PREFIX_static = $(QWT_PREFIX_shared)
129+
122130
//////////////////////////////////////////////////////////////////////
123131
// do not change these unless you have a very odd layout for them
124132
// or they just aren't coming out right in Xcode
@@ -151,6 +159,9 @@
151159
//SQLITE_LIB = $(SQLITE_LIB_$(SQLITE_FORM))
152160
//SPATIALITE_LIBADD = $(GEOS_LIB) $(PROJ_LIB)
153161

162+
//QWT_INC = $(QWT_PREFIX)/include
163+
//QWT_LIB = -L$(QWT_PREFIX)/lib -lqwt
164+
154165
//PYTHON_PREFIX = $(PYTHON_PREFIX_$(PYTHON_FORM))/Versions/$(PYTHON_VERSION)
155166
//PYTHON_BIN = $(PYTHON_BIN_$(PYTHON_FORM)) // Python executables
156167
//PYTHON_USRBIN = $(PYTHON_USRBIN_$(PYTHON_FORM)) // User-installed executables

0 commit comments

Comments
 (0)
Please sign in to comment.