Skip to content

Commit 8da10c5

Browse files
author
kyngchaos
committedAug 22, 2010
add mapserver (r14110, r14120)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14124 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 72f0714 commit 8da10c5

File tree

4 files changed

+395
-14
lines changed

4 files changed

+395
-14
lines changed
 

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

Lines changed: 352 additions & 3 deletions
Large diffs are not rendered by default.

‎mac/xcode/ReadMe.rtf

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@ See the Qgis {\field{\*\fldinst{HYPERLINK "http://wiki.qgis.org/qgiswiki/Buildin
6060
\ul Spatialite library\ulnone - Spatialite is included in the SQLite framework starting with 3.6.11. Or usethe internal copy (tied to the internal SQLite).\
6161
\
6262
\ul Expat library\ulnone - Leopard and above includes expat. The one in X11 should work on Tiger, but I prefer to avoid X11 dependencies.\
63-
\
63+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
64+
\cf0 \
65+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
66+
\cf0 \ul \ulc0 Fcgi library\ulnone - Leopard and above includes fcgi. Must be compiled from source for earlier systems.\
67+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
68+
\cf0 \
6469
\ul Bison\ulnone - Leopard and above includes bison. Tiger has an old bison that won't work for QGIS. See the QGIS install instructions for info about how to compile and install this on Tiger.\
6570
\
6671
\ul gpsbabel\ulnone (optional) - for the GPS Import plugin. A universal gpsbabel is available from gpsbabel.org.\
@@ -96,7 +101,7 @@ The xcconfig file is a simple text file with environment variables and values, a
96101
\ulnone \
97102
The default configuration is for a universal build, with the Leopard (10.5) SDK.\
98103
\
99-
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.\
104+
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 and fcgi are from the system on Leopard and above, and are 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.\
100105
\
101106
By default, Qt and the Postgres client library are bundled in the Qgis application.\
102107
\

‎mac/xcode/qgis_settings.xcconfig

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ SPATIALITE_PROJ = yes
8686

8787
GSL_FORM = fw // fw, static or shared
8888
PGSQL_FORM = shared // static or shared
89+
FCGI_FORM = system // system (only Leo+), static or shared
8990

9091
// system expat only on Leopard+
9192
EXPAT_FORM = $(EXPAT_FORM_$(SDKSYS)) // static, shared or system
@@ -113,6 +114,7 @@ QWT_VERSION = 5.2.1-svn // default in pyqwt package
113114
// Qt always bundled - else Qt plugins will load that cause grief
114115

115116
BUNDLE_PGSQL = YES
117+
BUNDLE_FCGI = YES
116118
BUNDLE_GPSBABEL = YES
117119

118120
// frameworks not bundled
@@ -152,6 +154,9 @@ PGSQL_PREFIX = /usr/local/pgsql
152154
// used to link static libs, defaults based on kyngchaos dist
153155
PGSQL_LIBADD = -lintl -framework CoreFoundation -liconv -lxml2 -lssl -lcrypto -lpam -lkrb5 -lldap -lz
154156

157+
FCGI_PREFIX_shared = /usr/local
158+
FCGI_PREFIX_static = /usr/local
159+
155160
QWT_PREFIX_shared = /usr/local/qwt-$(QWT_VERSION)
156161
QWT_PREFIX_static = $(QWT_PREFIX_shared)
157162

@@ -182,7 +187,10 @@ QGIS_LIB_SUBDIR = lib // qgispython lib MUST be in MacOS/lib
182187
QGIS_DATA_SUBDIR = ../Resources
183188
QGIS_PLUGIN_SUBDIR = ../PlugIns/qgis
184189
QGIS_LIBEXEC_SUBDIR = lib/gqis
185-
QGIS_LIBEXEC_REL = ../.. // for backing out in relative paths, match depth of _SUBDIR above
190+
QGIS_LIBEXEC_SUBDIR_REV = ../.. // for backing out in relative paths, match depth of _SUBDIR above
191+
QGIS_CGIBIN_SUBDIR = bin
192+
QGIS_CGIBIN_SUBDIR_REV = ..
193+
186194
QGIS_HEADER_SEARCH_BASE = $(SYMROOT)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/include
187195
HEADER_SEARCH_PATHS = $(QGIS_HEADER_SEARCH_BASE)
188196
ALWAYS_SEARCH_USER_PATHS = NO
@@ -339,6 +347,19 @@ PGSQL_HAVE_shared = -DHAVE_PGCONFIG=1
339347
PGSQL_HAVE_static = -DHAVE_PGCONFIG=1
340348
PGSQL_HAVE = $(PGSQL_HAVE_$(PGSQL_FORM))
341349

350+
FCGI_PREFIX_system = /usr
351+
FCGI_INC_shared = $(FCGI_PREFIX_shared)/include
352+
FCGI_INC_static = $(FCGI_PREFIX_static)/include
353+
FCGI_INC_system =
354+
FCGI_INC = $(FCGI_INC_$(FCGI_FORM))
355+
FCGI_LIB_shared = $(FCGI_PREFIX_shared)/lib -lfcgi
356+
FCGI_LIB_static = $(FCGI_PREFIX_static)/lib -lfcgi
357+
FCGI_LIB_system = -lfcgi
358+
FCGI_LIB = $(FCGI_LIB_$(FCGI_FORM))
359+
FCGI_DEFS_Release =
360+
FCGI_DEFS_Debug = QGSMSDEBUG=1
361+
FCGI_DEFS = $(FCGI_DEFS_$(CONFIGURATION))
362+
342363
SQLITE_PREFIX_fw = /Library/Frameworks/SQLite3.framework
343364
SQLITE_INC_system =
344365
SQLITE_INC_fw = $(SQLITE_PREFIX_fw)/Headers

‎mac/xcode/qgis_user-template.xcconfig

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868

6969
//GSL_FORM = fw // fw, static or shared
7070
//PGSQL_FORM = shared // static or shared
71+
//FCGI_FORM = system // system (only Leo+), static or shared
7172

7273
// system expat only on Leopard+
7374
//EXPAT_FORM = $(EXPAT_FORM_$(SDKSYS)) // static, shared or system
@@ -92,6 +93,7 @@
9293
//////////////////////////////////////////////////////////////////////
9394

9495
//BUNDLE_PGSQL = YES
96+
//BUNDLE_FCGI = YES
9597
//BUNDLE_GPSBABEL = YES
9698

9799
// frameworks not bundled
@@ -115,12 +117,11 @@
115117
// shared and static use same prefix
116118
//////////////////////////////////////////////////////////////////////
117119

118-
//GDAL_PREFIX_shared = /usr/local
119-
//PROJ_PREFIX_shared = /usr/local
120-
//GEOS_PREFIX_shared = /usr/local
120+
//GDAL_PREFIX = /usr/local
121+
//PROJ_PREFIX = /usr/local
122+
//GEOS_PREFIX = /usr/local
121123

122-
//GSL_PREFIX_shared = /usr/local
123-
//GSL_PREFIX_static = /usr/local
124+
//GSL_PREFIX = /usr/local
124125

125126
// This must match exactly how GRASS was built and installed.
126127
// If it was moved or renamed, qgis GRASS plugin will not work.
@@ -132,14 +133,15 @@
132133

133134
//EXPAT_PREFIX = /usr/local // not used for system expat
134135

135-
//SQLITE_PREFIX_shared = /usr/local
136+
//SQLITE_PREFIX = /usr/local
136137

137138
//PGSQL_PREFIX = /usr/local/pgsql
138139
// used to link static libs, defaults based on kyngchaos dist
139140
//PGSQL_LIBADD = -lintl -framework CoreFoundation -liconv -lxml2 -lssl -lcrypto -lpam -lkrb5 -lldap -lz
140141

141-
//QWT_PREFIX_shared = /usr/local/qwt-$(QWT_VERSION)
142-
//QWT_PREFIX_static = $(QWT_PREFIX_shared)
142+
//FCGI_PREFIX = /usr/local
143+
144+
//QWT_PREFIX = /usr/local/qwt-$(QWT_VERSION)
143145

144146
//PYTHON_USRBIN = $(PYTHON_USRBIN_$(PYTHON_FORM)) // User-installed executables
145147

@@ -171,6 +173,10 @@
171173
//PGSQL_INC = $(PGSQL_PREFIX)/include
172174
//PGSQL_LIB = $(PGSQL_LIB_$(PGSQL_FORM))
173175

176+
//FCGI_INC = $(FCGI_INC_$(FCGI_FORM))
177+
//FCGI_LIB = $(FCGI_LIB_$(FCGI_FORM))
178+
//FCGI_DEFS = $(FCGI_DEFS_$(CONFIGURATION))
179+
174180
//SQLITE_INC = $(SQLITE_INC_$(SQLITE_FORM))
175181
//SQLITE_LIB = $(SQLITE_LIB_$(SQLITE_FORM))
176182
//SPATIALITE_LIBADD = $(GEOS_LIB) $(PROJ_LIB)

0 commit comments

Comments
 (0)
Please sign in to comment.