Skip to content

Commit 22a2f82

Browse files
author
kyngchaos
committed
add GSL framework option
git-svn-id: http://svn.osgeo.org/qgis/trunk@12649 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 49da436 commit 22a2f82

File tree

3 files changed

+25
-18
lines changed

3 files changed

+25
-18
lines changed

mac/xcode/ReadMe.rtf

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf110
1+
{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf250
22
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Monaco;}
33
{\colortbl;\red255\green255\blue255;}
44
\vieww10500\viewh12500\viewkind0
@@ -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.2.1 2009-9-27\
13+
\i \cf0 2.3.0 2009-12-28\
1414
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
1515
1616
\i0 \cf0 \
@@ -51,7 +51,7 @@ See the Qgis {\field{\*\fldinst{HYPERLINK "http://wiki.qgis.org/qgiswiki/Buildin
5151
\i See note below.
5252
\i0 \
5353
\
54-
\ul GSL libraries\ulnone (optional)\
54+
\ul GSL library or framework\ulnone (optional) - a universal GSL.framework is available.\
5555
\
5656
\ul Postgres client library\ulnone (optional) - normally available in a full Postgres installation.\
5757
\
@@ -90,9 +90,9 @@ The xcconfig file is a simple text file with environment variables and values, a
9090
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
9191
\cf0 \ul Defaults\
9292
\ulnone \
93-
The default configuration is for a universal build, with the Leopard (10.5) SDK. GDAL, PROJ, GEOS and SQLite frameworks are used. Spatialite is expected in the SQLite framework. Postgres and GSL are expected in default /usr/local builds. Expat is from the system on Leopard and above, and is expected in /usr/local on Tiger. GRASS support is from a GRASS-6.4.app application. The python.org Python framework is used on Tiger, and the system Python is used on Leopard and above.\
93+
The default configuration is for a universal build, with the Leopard (10.5) SDK. GDAL, PROJ, GEOS, GSL and SQLite frameworks are used. Spatialite is expected in the SQLite framework. Postgres is expected in default /usr/local builds. Expat is from the system on Leopard and above, and is expected in /usr/local on Tiger. GRASS support is from a GRASS-6.4.app application. The python.org Python framework is used on Tiger, and the system Python is used on Leopard and above.\
9494
\
95-
By default, Qt, GSL, the Postgres client library are bundled in the Qgis application.\
95+
By default, Qt and the Postgres client library are bundled in the Qgis application.\
9696
\
9797
\ul Minimal Config\ulnone \
9898
\
@@ -132,16 +132,15 @@ ln -s /Users/Shared/unix /Developer/SDKs/MacOSX10.4u.sdk/Users/Shared/unix
132132
\i space-separated
133133
\i0 list.\
134134
\
135-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
136135

137-
\f1\fs20 \cf0 ARCHS_P
136+
\f1\fs20 ARCHS_P
138137
\f0\fs24 is a list of which architectures to build for Python, this must match the archs in ARCHS. This one is a
139138
\i semicolon-separated
140139
\i0 list.\
141-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
142-
\cf0 \
143140
\
144-
\ul Misc Support\
141+
\
142+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
143+
\cf0 \ul Misc Support\
145144
\ulnone \
146145
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
147146

mac/xcode/qgis_settings.xcconfig

Lines changed: 12 additions & 5 deletions
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.2.2
3+
CURRENT_PROJECT_VERSION = 2.3.0
44

55
// SDKSYS must be set to valid value
66
SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
@@ -67,7 +67,7 @@ SQLITE_FORM = fw // system, fw, shared or internal
6767
SPATIALITE_GEOS = yes
6868
SPATIALITE_PROJ = yes
6969

70-
GSL_FORM = shared // static or shared
70+
GSL_FORM = fw // fw, static or shared
7171
PGSQL_FORM = shared // static or shared
7272

7373
// system expat only on Leopard+
@@ -91,10 +91,10 @@ PYTHON_VERSION = $(PYTHON_VERSION_$(SDKSYS))
9191
// bundling GRASS doesn't make sense, as a full GRASS install is required
9292
// Qt always bundled - else Qt plugins will load that cause grief
9393

94-
BUNDLE_GSL = YES
9594
BUNDLE_PGSQL = YES
9695
BUNDLE_GPSBABEL = YES
9796
// frameworks not bundled
97+
BUNDLE_GSL = YES
9898
BUNDLE_GDAL = YES
9999
BUNDLE_GEOS = YES
100100
BUNDLE_PROJ = YES
@@ -111,7 +111,8 @@ GDAL_PREFIX_shared = /usr/local
111111
PROJ_PREFIX_shared = /usr/local
112112
GEOS_PREFIX_shared = /usr/local
113113

114-
GSL_PREFIX = /usr/local
114+
GSL_PREFIX_shared = /usr/local
115+
GSL_PREFIX_static = /usr/local
115116

116117
// This must match exactly how GRASS was built and installed.
117118
// If it was moved or renamed, qgis GRASS plugin will not work.
@@ -278,7 +279,13 @@ EXPAT_LIB_shared = $(EXPAT_PREFIX)/lib/libexpat.dylib
278279
EXPAT_LIB_static = $(EXPAT_PREFIX)/lib/libexpat.a
279280
EXPAT_LIB = $(EXPAT_LIB_$(EXPAT_FORM))
280281

281-
GSL_INC = $(GSL_PREFIX)/include
282+
GSL_PREFIX_fw = /Library/Frameworks/GSL.framework
283+
GSL_PREFIX = $(GSL_PREFIX_$(GSL_FORM))
284+
GSL_INC_fw = $(GSL_PREFIX_fw)/Headers
285+
GSL_INC_shared = $(GSL_PREFIX)/include
286+
GSL_INC_static = $(GSL_PREFIX)/include
287+
GSL_INC = $(GSL_INC_$(GSL_FORM))
288+
GSL_LIB_fw = -framework GSL
282289
GSL_LIB_shared = -L$(GSL_PREFIX)/lib -lgsl -lm
283290
GSL_LIB_static = $(GSL_PREFIX)/lib/libgsl.a $(GSL_PREFIX)/lib/libgslcblas.a -lm
284291
GSL_LIB = $(GSL_LIB_$(GSL_FORM))

mac/xcode/qgis_user-template.xcconfig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
//SPATIALITE_GEOS = yes
5252
//SPATIALITE_PROJ = yes
5353

54-
//GSL_FORM = shared // static or shared
54+
//GSL_FORM = fw // fw, static or shared
5555
//PGSQL_FORM = shared // static or shared
5656

5757
// system expat only on Leopard+
@@ -100,7 +100,8 @@
100100
//PROJ_PREFIX_shared = /usr/local
101101
//GEOS_PREFIX_shared = /usr/local
102102

103-
//GSL_PREFIX = /usr/local
103+
//GSL_PREFIX_shared = /usr/local
104+
//GSL_PREFIX_static = /usr/local
104105

105106
// This must match exactly how GRASS was built and installed.
106107
// If it was moved or renamed, qgis GRASS plugin will not work.
@@ -140,7 +141,7 @@
140141
//EXPAT_INC = $(EXPAT_INC_$(EXPAT_FORM))
141142
//EXPAT_LIB = $(EXPAT_LIB_$(EXPAT_FORM))
142143

143-
//GSL_INC = $(GSL_PREFIX)/include
144+
//GSL_INC = $(GSL_INC_$(GSL_FORM))
144145
//GSL_LIB = $(GSL_LIB_$(GSL_FORM))
145146

146147
//PGSQL_INC = $(PGSQL_PREFIX)/include

0 commit comments

Comments
 (0)