Skip to content

Commit ec6feb8

Browse files
author
kyngchaos
committedFeb 22, 2009
add geos_c lib to bundling script; remove unused carbon framework; settings cleanup
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10220 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent ad6ce5a commit ec6feb8

File tree

2 files changed

+26
-50
lines changed

2 files changed

+26
-50
lines changed
 

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3016,7 +3016,7 @@
30163016
isa = PBXContainerItemProxy;
30173017
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
30183018
proxyType = 1;
3019-
remoteGlobalIDString = 72A07D880F3BDF9C004FC2A4 /* postgresprovider */;
3019+
remoteGlobalIDString = 72A07D880F3BDF9C004FC2A4;
30203020
remoteInfo = postgresprovider;
30213021
};
30223022
/* End PBXContainerItemProxy section */
@@ -4976,7 +4976,6 @@
49764976
/* End PBXCopyFilesBuildPhase section */
49774977

49784978
/* Begin PBXFileReference section */
4979-
20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
49804979
508344B209E5C41E0093A071 /* Qgis.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Qgis.app; sourceTree = BUILT_PRODUCTS_DIR; };
49814980
7209CEF40F4DA70000DAC424 /* r.watershed.qgm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = r.watershed.qgm; path = ../../src/plugins/grass/modules/r.watershed.qgm; sourceTree = SOURCE_ROOT; };
49824981
7209CEF50F4DA70000DAC424 /* r.watershed.2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = r.watershed.2.png; path = ../../src/plugins/grass/modules/r.watershed.2.png; sourceTree = SOURCE_ROOT; };
@@ -8385,7 +8384,6 @@
83858384
7209F4B80F3A5434003DC336 /* CoreFoundation.framework */,
83868385
7209F4B90F3A5434003DC336 /* CoreServices.framework */,
83878386
7209F03A0F39E6A1003DC336 /* ApplicationServices.framework */,
8388-
20286C33FDCF999611CA2CEA /* Carbon.framework */,
83898387
);
83908388
name = "External Frameworks and Libraries";
83918389
sourceTree = "<group>";
@@ -13613,7 +13611,7 @@
1361313611
);
1361413612
runOnlyForDeploymentPostprocessing = 0;
1361513613
shellPath = /bin/sh;
13616-
shellScript = "# Note: quoting messes up the -change action in install_name_tool, so for now\n# dependency libraries should have no spaces in paths. ***FIXME***\n\ncd \"$QGIS_BUILD_PATH/MacOS/$QGIS_PLUGIN_SUBDIR\"\npluglist=`ls *.so`\n\ncd \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR\"\nliblist=`ls *.dylib`\n\ncd \"$PROJECT_DIR\"\n\n# Postgres\n\nPGSQLROOT=\"$PGSQL_PREFIX/lib\"\nif [ \"$BUNDLE_PGSQL\" = \"YES\" ] && [ -f \"$PGSQLROOT/libpq.dylib\" ] ; then\n\tcp -f \"$PGSQLROOT/libpq.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libpq.dylib\"\n\tplib=`otool -L \"$PGSQLROOT/libpq.dylib\" | grep -E -m 1 \"libpq.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tPGSQL_CHG=\"-change $plib @executable_path/$QGIS_LIB_SUBDIR/libpq.dylib\"\nfi\n\n# GDAL\n# *** Note: may need support files also ***\n\nGDALROOT=\"$GDAL_PREFIX/lib\"\nif [ \"$BUNDLE_GDAL\" = \"YES\" ] && [ \"$GDAL_FORM\" = \"shared\" ] && [ -f \"$GDALROOT/libgdal.dylib\" ] ; then\n\tcp -f \"$GDALROOT/libgdal.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libgdal.dylib\"\n\tglib=`otool -L \"$GDALROOT/libgdal.dylib\" | grep -E -m 1 \"libgdal.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tGDAL_CHG=\"-change $glib @executable_path/$QGIS_LIB_SUBDIR/libgdal.dylib\"\nfi\n\n# PROJ\n# *** Note: may need support files also ***\n\nPROJROOT=\"$PROJ_PREFIX/lib\"\nif [ \"$BUNDLE_PROJ\" = \"YES\" ] && [ \"$PROJ_FORM\" = \"shared\" ] && [ -f \"$PROJROOT/libproj.dylib\" ] ; then\n\tcp -f \"$PROJROOT/libproj.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libproj.dylib\"\n\tplib=`otool -L \"$PROJROOT/libproj.dylib\" | grep -E -m 1 \"libproj.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tPROJ_CHG=\"-change $plib @executable_path/$QGIS_LIB_SUBDIR/libproj.dylib\"\nfi\n\n# GEOS\n\nGEOSROOT=\"$GEOS_PREFIX/lib\"\nif [ \"$BUNDLE_GEOS\" = \"YES\" ] && [ \"$GEOS_FORM\" = \"shared\" ] && [ -f \"$GEOSROOT/libgeos.dylib\" ] ; then\n\tcp -f \"$GEOSROOT/libgeos.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libgeos.dylib\"\n\tglib=`otool -L \"$GEOSROOT/libgeos.dylib\" | grep -E -m 1 \"libgeos.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tGEOS_CHG=\"-change $glib @executable_path/$QGIS_LIB_SUBDIR/libgeos.dylib\"\nfi\n\n# SQLite\n\nSQLITEROOT=\"$SQLITE_PREFIX/lib\"\nif [ \"$BUNDLE_SQLITE\" = \"YES\" ] && [ \"$SQLITE_FORM\" = \"shared\" ] && [ -f \"$SQLITEROOT/libsqlite3.dylib\" ] ; then\n\tcp -f \"$SQLITEROOT/libsqlite3.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libsqlite3.dylib\"\n\tslib=`otool -L \"$SQLITEROOT/libsqlite3.dylib\" | grep -E -m 1 \"libsqlite3.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tSQLITE_CHG=\"-change $slib @executable_path/$QGIS_LIB_SUBDIR/libsqlite3.dylib\"\nfi\n\n# GSL\n\nGSLROOT=\"$GSL_PREFIX/lib\"\nif [ \"$BUNDLE_GSL\" = \"YES\" ] && [ \"$GSL_FORM\" = \"shared\" ] && [ -f \"$GSLROOT/libgsl.dylib\" ] ; then\n\tcp -f \"$GSLROOT/libgsl.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libgsl.dylib\"\n\tcp -f \"$GSLROOT/libgslcblas.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libgslcblas.dylib\"\n\tglib=`otool -L \"$GSLROOT/libgsl.dylib\" | grep -E -m 1 \"libgsl.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tgclib=`otool -L \"$GSLROOT/libgslcblas.dylib\" | grep -E -m 1 \"libgslcblas.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tGSL_CHG=\"-change $glib @executable_path/$QGIS_LIB_SUBDIR/libgsl.dylib -change $gclib @executable_path/$QGIS_LIB_SUBDIR/libgslcblas.dylib\"\nfi\n\n# change for all bundled libs now\n\necho \"install_name_tool $PGSQL_CHG $GDAL_CHG $PROJ_CHG $GEOS_CHG $SQLITE_CHG $GSL_CHG \\\"$QGIS_BUILD_PATH/MacOS/Qgis\\\"\"\ninstall_name_tool $PGSQL_CHG $GDAL_CHG $PROJ_CHG $GEOS_CHG $SQLITE_CHG $GSL_CHG \"$QGIS_BUILD_PATH/MacOS/Qgis\"\n\nfor p in $pluglist\ndo\n\tinstall_name_tool $PGSQL_CHG $GDAL_CHG $PROJ_CHG $GEOS_CHG $SQLITE_CHG $GSL_CHG \"$QGIS_BUILD_PATH/MacOS/$QGIS_PLUGIN_SUBDIR/$p\"\ndone\n\nfor l in $liblist\ndo\n\tinstall_name_tool $PGSQL_CHG $GDAL_CHG $PROJ_CHG $GEOS_CHG $SQLITE_CHG $GSL_CHG \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/$l\"\ndone\n\nif [ -f \"$QGIS_BUILD_PATH/MacOS/$QGIS_DATA_SUBDIR/python/qgis/core.so\" ] ; then\n\tinstall_name_tool $PGSQL_CHG $GDAL_CHG $PROJ_CHG $GEOS_CHG $SQLITE_CHG $GSL_CHG \"$QGIS_BUILD_PATH/MacOS/$QGIS_DATA_SUBDIR/python/qgis/core.so\"\n\tinstall_name_tool $PGSQL_CHG $GDAL_CHG $PROJ_CHG $GEOS_CHG $SQLITE_CHG $GSL_CHG \"$QGIS_BUILD_PATH/MacOS/$QGIS_DATA_SUBDIR/python/qgis/gui.so\"\nfi\n# other bundling\n\n# gpsbabel\n\nif [ \"$BUNDLE_GPSBABEL\" = \"YES\" ] && [ -f \"$GPSBABEL\" ] ; then\n\tcp -f \"$GPSBABEL\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_BIN_SUBDIR\"/\nfi\n";
13614+
shellScript = "# Note: quoting messes up the -change action in install_name_tool, so for now\n# dependency libraries should have no spaces in paths. ***FIXME***\n\ncd \"$QGIS_BUILD_PATH/MacOS/$QGIS_PLUGIN_SUBDIR\"\npluglist=`ls *.so`\n\ncd \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR\"\nliblist=`ls *.dylib`\n\ncd \"$PROJECT_DIR\"\n\n# Postgres\n\nPGSQLROOT=\"$PGSQL_PREFIX/lib\"\nif [ \"$BUNDLE_PGSQL\" = \"YES\" ] && [ -f \"$PGSQLROOT/libpq.dylib\" ] ; then\n\tcp -f \"$PGSQLROOT/libpq.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libpq.dylib\"\n\tplib=`otool -L \"$PGSQLROOT/libpq.dylib\" | grep -E -m 1 \"libpq.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tPGSQL_CHG=\"-change $plib @executable_path/$QGIS_LIB_SUBDIR/libpq.dylib\"\nfi\n\n# GDAL\n# *** Note: may need support files also ***\n\nGDALROOT=\"$GDAL_PREFIX/lib\"\nif [ \"$BUNDLE_GDAL\" = \"YES\" ] && [ \"$GDAL_FORM\" = \"shared\" ] && [ -f \"$GDALROOT/libgdal.dylib\" ] ; then\n\tcp -f \"$GDALROOT/libgdal.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libgdal.dylib\"\n\tglib=`otool -L \"$GDALROOT/libgdal.dylib\" | grep -E -m 1 \"libgdal.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tGDAL_CHG=\"-change $glib @executable_path/$QGIS_LIB_SUBDIR/libgdal.dylib\"\nfi\n\n# PROJ\n# *** Note: may need support files also ***\n\nPROJROOT=\"$PROJ_PREFIX/lib\"\nif [ \"$BUNDLE_PROJ\" = \"YES\" ] && [ \"$PROJ_FORM\" = \"shared\" ] && [ -f \"$PROJROOT/libproj.dylib\" ] ; then\n\tcp -f \"$PROJROOT/libproj.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libproj.dylib\"\n\tplib=`otool -L \"$PROJROOT/libproj.dylib\" | grep -E -m 1 \"libproj.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tPROJ_CHG=\"-change $plib @executable_path/$QGIS_LIB_SUBDIR/libproj.dylib\"\nfi\n\n# GEOS\n\nGEOSROOT=\"$GEOS_PREFIX/lib\"\nif [ \"$BUNDLE_GEOS\" = \"YES\" ] && [ \"$GEOS_FORM\" = \"shared\" ] && [ -f \"$GEOSROOT/libgeos.dylib\" ] ; then\n\tcp -f \"$GEOSROOT/libgeos.dylib\" \"$GEOSROOT/libgeos_c.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/\"\n\tglib=`otool -L \"$GEOSROOT/libgeos.dylib\" | grep -E -m 1 \"libgeos.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tgclib=`otool -L \"$GEOSROOT/libgeos_c.dylib\" | grep -E -m 1 \"libgeos_c.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tGEOS_CHG=\"-change $glib @executable_path/$QGIS_LIB_SUBDIR/libgeos.dylib -change $gclib @executable_path/$QGIS_LIB_SUBDIR/libgeos_c.dylib\"\nfi\n\n# SQLite\n\nSQLITEROOT=\"$SQLITE_PREFIX/lib\"\nif [ \"$BUNDLE_SQLITE\" = \"YES\" ] && [ \"$SQLITE_FORM\" = \"shared\" ] && [ -f \"$SQLITEROOT/libsqlite3.dylib\" ] ; then\n\tcp -f \"$SQLITEROOT/libsqlite3.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libsqlite3.dylib\"\n\tslib=`otool -L \"$SQLITEROOT/libsqlite3.dylib\" | grep -E -m 1 \"libsqlite3.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tSQLITE_CHG=\"-change $slib @executable_path/$QGIS_LIB_SUBDIR/libsqlite3.dylib\"\nfi\n\n# GSL\n\nGSLROOT=\"$GSL_PREFIX/lib\"\nif [ \"$BUNDLE_GSL\" = \"YES\" ] && [ \"$GSL_FORM\" = \"shared\" ] && [ -f \"$GSLROOT/libgsl.dylib\" ] ; then\n\tcp -f \"$GSLROOT/libgsl.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libgsl.dylib\"\n\tcp -f \"$GSLROOT/libgslcblas.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libgslcblas.dylib\"\n\tglib=`otool -L \"$GSLROOT/libgsl.dylib\" | grep -E -m 1 \"libgsl.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tgclib=`otool -L \"$GSLROOT/libgslcblas.dylib\" | grep -E -m 1 \"libgslcblas.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tGSL_CHG=\"-change $glib @executable_path/$QGIS_LIB_SUBDIR/libgsl.dylib -change $gclib @executable_path/$QGIS_LIB_SUBDIR/libgslcblas.dylib\"\nfi\n\n# change for all bundled libs now\n\necho \"install_name_tool $PGSQL_CHG $GDAL_CHG $PROJ_CHG $GEOS_CHG $SQLITE_CHG $GSL_CHG \\\"$QGIS_BUILD_PATH/MacOS/Qgis\\\"\"\ninstall_name_tool $PGSQL_CHG $GDAL_CHG $PROJ_CHG $GEOS_CHG $SQLITE_CHG $GSL_CHG \"$QGIS_BUILD_PATH/MacOS/Qgis\"\n\nfor p in $pluglist\ndo\n\tinstall_name_tool $PGSQL_CHG $GDAL_CHG $PROJ_CHG $GEOS_CHG $SQLITE_CHG $GSL_CHG \"$QGIS_BUILD_PATH/MacOS/$QGIS_PLUGIN_SUBDIR/$p\"\ndone\n\nfor l in $liblist\ndo\n\tinstall_name_tool $PGSQL_CHG $GDAL_CHG $PROJ_CHG $GEOS_CHG $SQLITE_CHG $GSL_CHG \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/$l\"\ndone\n\nif [ -f \"$QGIS_BUILD_PATH/MacOS/$QGIS_DATA_SUBDIR/python/qgis/core.so\" ] ; then\n\tinstall_name_tool $PGSQL_CHG $GDAL_CHG $PROJ_CHG $GEOS_CHG $SQLITE_CHG $GSL_CHG \"$QGIS_BUILD_PATH/MacOS/$QGIS_DATA_SUBDIR/python/qgis/core.so\"\n\tinstall_name_tool $PGSQL_CHG $GDAL_CHG $PROJ_CHG $GEOS_CHG $SQLITE_CHG $GSL_CHG \"$QGIS_BUILD_PATH/MacOS/$QGIS_DATA_SUBDIR/python/qgis/gui.so\"\nfi\n# other bundling\n\n# gpsbabel\n\nif [ \"$BUNDLE_GPSBABEL\" = \"YES\" ] && [ -f \"$GPSBABEL\" ] ; then\n\tcp -f \"$GPSBABEL\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_BIN_SUBDIR\"/\nfi\n";
1361713615
showEnvVarsInLog = 0;
1361813616
};
1361913617
729277F00F3A816100D9C992 /* ShellScript */ = {

‎mac/xcode/qgis_settings.xcconfig

Lines changed: 24 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,29 @@ ARCHS = $(NATIVE_ARCH)
1313
// QGIS version info & config
1414
//////////////////////////////////////////////////////////////////////
1515

16-
// major-minor-micro must be integers for Mac OS X
16+
// major-minor-patch must be integers for Mac OS X
1717
QGIS_RELEASE_NAME = Unstable-trunk
1818
QGIS_VERSION_MAJOR = 1
1919
QGIS_VERSION_MINOR = 1
2020
QGIS_VERSION_PATCH = 0
21-
QGIS_VERSION_BUILD = 20090215
21+
QGIS_VERSION_BUILD = 20090221
2222
QGIS_VERSION_FULL = $(QGIS_VERSION_MAJOR).$(QGIS_VERSION_MINOR).$(QGIS_VERSION_PATCH)-$(QGIS_VERSION_BUILD)
2323
QGIS_VERSION_INT = 10100
2424

2525
// library version - generally, keep in sync with qgis version
26-
LIBQGIS_VERSION_MAJOR = 1
27-
LIBQGIS_VERSION_MINOR = 1
26+
LIBQGIS_VERSION_MAJOR = $(QGIS_VERSION_MAJOR)
27+
LIBQGIS_VERSION_MINOR = $(QGIS_VERSION_MINOR)
2828
LIBQGIS_VERSION_CURRENT = $(LIBQGIS_VERSION_MAJOR).$(LIBQGIS_VERSION_MINOR)
2929
LIBQGIS_VERSION_COMPAT = $(LIBQGIS_VERSION_MAJOR).0
3030

3131
//////////////////////////////////////////////////////////////////////
3232
// Qt and other support
3333
//////////////////////////////////////////////////////////////////////
3434

35+
// ***TODO*** - detect current version, only used in bundle script
36+
QT_FWVER = 4 // the Versions/ folder name
37+
QT_MVER = 4 // the install_name version
38+
3539
QTDIR = /Developer/Tools/Qt
3640
QTMOC = $(QTDIR)/moc
3741
QTUIC = $(QTDIR)/uic
@@ -57,8 +61,7 @@ GDAL_FORM = fw // fw or shared
5761
PROJ_FORM = fw // fw or shared
5862
GEOS_FORM = fw // fw or shared
5963

60-
// system sqlite3 only on Tiger+
61-
// could also have source form for in-source copy
64+
// could also have source form for in-source copy ***TODO***
6265
SQLITE_FORM = fw // fw, system, static or shared
6366

6467
GSL_FORM = shared // static or shared
@@ -73,6 +76,7 @@ GRASS_VERSION = 6.4
7376

7477
// system Python only on Leopard+
7578
PYTHON_FORM = fw // fw, system or disabled
79+
// ***TODO*** "Current" will autodetect version
7680
PYTHON_VERSION = 2.5 // can't auto-detect here
7781

7882
//////////////////////////////////////////////////////////////////////
@@ -83,39 +87,16 @@ PYTHON_VERSION = 2.5 // can't auto-detect here
8387
//////////////////////////////////////////////////////////////////////
8488

8589
// bundling GRASS doesn't make sense, as a full GRASS install is required
90+
// Qt always bundled - else Qt plugins will load that cause grief
8691

87-
//BUNDLE_QT = YES // always - else Qt plugins will load that cause grief
8892
BUNDLE_GSL = YES
8993
BUNDLE_PGSQL = YES
9094
BUNDLE_GPSBABEL = YES
91-
92-
// no need to bundle frameworks
93-
BUNDLE_GDAL = NO
94-
BUNDLE_GEOS = NO
95-
BUNDLE_PROJ = NO
96-
BUNDLE_SQLITE = NO
97-
98-
//////////////////////////////////////////////////////////////////////
99-
// support library versions
100-
// if shared libraries are bundled, need to change install_names
101-
// and need to know library version as it currently is specified
102-
// in the library
103-
// check a library version with otool -L /path/to/library
104-
//////////////////////////////////////////////////////////////////////
105-
// ***** need to figure out install_names in script
106-
107-
GSL_LIBVER = 0
108-
PGSQL_LIBVER = 5
109-
QT_FWVER = 4 // the Versions/ folder name
110-
QT_MVER = 4 // the install_name version
111-
112-
// these only need to be checked for unix forms
113-
// since bundling is not set up yet for these, ignore them
114-
GDAL_LIBVER = 12
115-
PROJ_LIBVER = 4
116-
GEOS_LIBVER = 2
117-
GEOSC_LIBVER = 1 // GEOS has 2 libs, diff versions
118-
SQLITE_LIBVER = 0
95+
// frameworks not bundled
96+
BUNDLE_GDAL = YES
97+
BUNDLE_GEOS = YES
98+
BUNDLE_PROJ = YES
99+
BUNDLE_SQLITE = YES
119100

120101
//////////////////////////////////////////////////////////////////////
121102
// locations of user forms of dependencies
@@ -130,16 +111,15 @@ GEOS_PREFIX_shared = /usr/local
130111

131112
GSL_PREFIX = /usr/local
132113

133-
// this must match exactly how GRASS was *built*, not where it is currently
134-
// installed, if it was moved. ie GRASS.app must be directly in /Applications
135-
// prefix is the equivalent of the GRASS GISBASE
114+
// This must match exactly how GRASS was built and installed.
115+
// If it was moved or renamed, qgis GRASS plugin will not work.
116+
// Prefix is the equivalent of the GRASS GISBASE
136117
GRASS_PREFIX_app = /Applications/GRASS-$(GRASS_VERSION).app/Contents/MacOS
137118
GRASS_PREFIX_unix = /usr/local/grass-$(GRASS_VERSION)
138119

139120
EXPAT_PREFIX = /usr/local // not used for system expat
140121

141-
// unix SQLite defaults to system, but that's Tiger+ -only
142-
// use custom unix build for Panther-compatibility
122+
// unix SQLite defaults to system
143123
SQLITE_PREFIX_shared = /usr
144124

145125
PGSQL_PREFIX = /usr/local/pgsql
@@ -166,13 +146,13 @@ QGIS_BUILD_PATH = $(SYMROOT)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/$(QGIS_P
166146
// subdirs are relative to MacOS dir, as if MacOS is unix "prefix"
167147
QGIS_BIN_SUBDIR = bin // leave this alone for now
168148
QGIS_FW_SUBDIR = ../Frameworks
169-
QGIS_LIB_SUBDIR = lib
149+
QGIS_LIB_SUBDIR = lib // qgispython lib MUST be in MacOS/lib
170150
QGIS_DATA_SUBDIR = ../Resources
171151
QGIS_PLUGIN_SUBDIR = ../PlugIns/qgis
172152
HEADER_SEARCH_PATHS = generated
173153
//LIBRARY_SEARCH_PATHS = $(PROJECT_TARGET_APP_DIR)/../Frameworks
174154
ALWAYS_SEARCH_USER_PATHS = NO
175-
USE_HEADERMAP = NO
155+
USE_HEADERMAP = NO // else headers with same name cause confusion
176156

177157
DYLIB_CURRENT_VERSION = $(LIBQGIS_VERSION_MAJOR).$(LIBQGIS_VERSION_MINOR)
178158
DYLIB_COMPATIBILITY_VERSION = $(LIBQGIS_VERSION_MAJOR).0
@@ -209,20 +189,18 @@ QTDEFS_Debug = -DQT_DEBUG
209189
QTDEFS_Release = -DQT_NO_DEBUG
210190
QT_CXXFLAGS_APP = $(PGSQL_HAVE)
211191
QT_INC_QT3 = /Library/Frameworks/Qt3Support.framework/Headers
212-
// old qt: -D_REENTRANT -DQT_THREAD_SUPPORT
213-
// -I/Library/Frameworks/QtTest.framework/Headers
214192
QT_LIB_CORE = -framework QtCore
215193
QT_LIB_GUI = -framework QtGui
216194
QT_LIB_NET = -framework QtNetwork
217195
QT_LIB_XML = -framework QtXml
218196
QT_LIB_SVG = -framework QtSvg
219197
QT_LIB_SQL = -framework QtSql
220198
QT_LIB_QT3 = -framework Qt3Support
199+
// convenience for all Qt:
221200
QT_LIB = $(QT_LIB_CORE) $(QT_LIB_GUI) $(QT_LIB_NET) $(QT_LIB_XML) $(QT_LIB_SVG) $(QT_LIB_SQL)
222-
// -framework QtDesigner
223201

224202
// with a choice of system vs user unix libs, use full path to lib file
225-
// to avoid possible accidental linking to system lib
203+
// to avoid possible accidental linking to system lib (ie expat)
226204

227205
GDAL_PREFIX_fw = /Library/Frameworks/GDAL.framework
228206
GDAL_PREFIX = $(GDAL_PREFIX_$(GDAL_FORM))

0 commit comments

Comments
 (0)