add GSL framework option

git-svn-id: http://svn.osgeo.org/qgis/trunk@12649 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 29, 2009 · 22a2f82 · 22a2f82
1 parent 49da436
commit 22a2f82
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/mac/xcode/ReadMe.rtf b/mac/xcode/ReadMe.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf110
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf250
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Monaco;}
 {\colortbl;\red255\green255\blue255;}
 \vieww10500\viewh12500\viewkind0
@@ -10,7 +10,7 @@
 \b0\fs24 \cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\i \cf0 2.2.1	2009-9-27\
+\i \cf0 2.3.0	2009-12-28\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
 \i0 \cf0 \
@@ -51,7 +51,7 @@ See the Qgis {\field{\*\fldinst{HYPERLINK "http://wiki.qgis.org/qgiswiki/Buildin
 \i See note below.
 \i0 \
 \
-\ul GSL libraries\ulnone  (optional)\
+\ul GSL library or framework\ulnone  (optional) - a universal GSL.framework is available.\
 \
 \ul Postgres client library\ulnone  (optional) - normally available in a full Postgres installation.\
 \
@@ -90,9 +90,9 @@ The xcconfig file is a simple text file with environment variables and values, a
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 \cf0 \ul Defaults\
 \ulnone \
-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.\
+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.\
 \
-By default, Qt, GSL, the Postgres client library are bundled in the Qgis application.\
+By default, Qt and the Postgres client library are bundled in the Qgis application.\
 \
 \ul Minimal Config\ulnone \
 \
@@ -132,16 +132,15 @@ ln -s /Users/Shared/unix /Developer/SDKs/MacOSX10.4u.sdk/Users/Shared/unix
 \i space-separated
 \i0  list.\
 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\f1\fs20 \cf0 ARCHS_P
+\f1\fs20 ARCHS_P
 \f0\fs24  is a list of which architectures to build for Python, this must match the archs in ARCHS.  This one is a 
 \i semicolon-separated
 \i0  list.\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \
 \
-\ul Misc Support\
+\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+\cf0 \ul Misc Support\
 \ulnone \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 

diff --git a/mac/xcode/qgis_settings.xcconfig b/mac/xcode/qgis_settings.xcconfig
@@ -1,6 +1,6 @@
 // QGIS Xcode project common build settings
 
-CURRENT_PROJECT_VERSION = 2.2.2
+CURRENT_PROJECT_VERSION = 2.3.0
 
 // SDKSYS must be set to valid value
 SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
@@ -67,7 +67,7 @@ SQLITE_FORM = fw // system, fw, shared or internal
 SPATIALITE_GEOS = yes
 SPATIALITE_PROJ = yes
 
-GSL_FORM = shared // static or shared
+GSL_FORM = fw // fw, static or shared
 PGSQL_FORM = shared // static or shared
 
 // system expat only on Leopard+
@@ -91,10 +91,10 @@ PYTHON_VERSION = $(PYTHON_VERSION_$(SDKSYS))
 // bundling GRASS doesn't make sense, as a full GRASS install is required
 // Qt always bundled - else Qt plugins will load that cause grief
 
-BUNDLE_GSL = YES
 BUNDLE_PGSQL = YES
 BUNDLE_GPSBABEL = YES
 // frameworks not bundled
+BUNDLE_GSL = YES
 BUNDLE_GDAL = YES
 BUNDLE_GEOS = YES
 BUNDLE_PROJ = YES
@@ -111,7 +111,8 @@ GDAL_PREFIX_shared = /usr/local
 PROJ_PREFIX_shared = /usr/local
 GEOS_PREFIX_shared = /usr/local
 
-GSL_PREFIX = /usr/local
+GSL_PREFIX_shared = /usr/local
+GSL_PREFIX_static = /usr/local
 
 // This must match exactly how GRASS was built and installed.
 // If it was moved or renamed, qgis GRASS plugin will not work.
@@ -278,7 +279,13 @@ EXPAT_LIB_shared = $(EXPAT_PREFIX)/lib/libexpat.dylib
 EXPAT_LIB_static = $(EXPAT_PREFIX)/lib/libexpat.a
 EXPAT_LIB = $(EXPAT_LIB_$(EXPAT_FORM))
 
-GSL_INC = $(GSL_PREFIX)/include
+GSL_PREFIX_fw = /Library/Frameworks/GSL.framework
+GSL_PREFIX = $(GSL_PREFIX_$(GSL_FORM))
+GSL_INC_fw = $(GSL_PREFIX_fw)/Headers
+GSL_INC_shared = $(GSL_PREFIX)/include
+GSL_INC_static = $(GSL_PREFIX)/include
+GSL_INC = $(GSL_INC_$(GSL_FORM))
+GSL_LIB_fw = -framework GSL
 GSL_LIB_shared = -L$(GSL_PREFIX)/lib -lgsl -lm
 GSL_LIB_static = $(GSL_PREFIX)/lib/libgsl.a $(GSL_PREFIX)/lib/libgslcblas.a -lm
 GSL_LIB = $(GSL_LIB_$(GSL_FORM))

diff --git a/mac/xcode/qgis_user-template.xcconfig b/mac/xcode/qgis_user-template.xcconfig
@@ -51,7 +51,7 @@
 //SPATIALITE_GEOS = yes
 //SPATIALITE_PROJ = yes
 
-//GSL_FORM = shared // static or shared
+//GSL_FORM = fw // fw, static or shared
 //PGSQL_FORM = shared // static or shared
 
 // system expat only on Leopard+
@@ -100,7 +100,8 @@
 //PROJ_PREFIX_shared = /usr/local
 //GEOS_PREFIX_shared = /usr/local
 
-//GSL_PREFIX = /usr/local
+//GSL_PREFIX_shared = /usr/local
+//GSL_PREFIX_static = /usr/local
 
 // This must match exactly how GRASS was built and installed.
 // If it was moved or renamed, qgis GRASS plugin will not work.
@@ -140,7 +141,7 @@
 //EXPAT_INC = $(EXPAT_INC_$(EXPAT_FORM))
 //EXPAT_LIB = $(EXPAT_LIB_$(EXPAT_FORM))
 
-//GSL_INC = $(GSL_PREFIX)/include
+//GSL_INC = $(GSL_INC_$(GSL_FORM))
 //GSL_LIB = $(GSL_LIB_$(GSL_FORM))
 
 //PGSQL_INC = $(PGSQL_PREFIX)/include