Skip to content

Commit a7babd9

Browse files
author
kyngchaos
committed
misc updates, fixup mapserver build
git-svn-id: http://svn.osgeo.org/qgis/trunk@14384 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent eb6d1b3 commit a7babd9

File tree

2 files changed

+42
-5
lines changed

2 files changed

+42
-5
lines changed

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

+37-1
Original file line numberDiff line numberDiff line change
@@ -2191,6 +2191,8 @@
21912191
72FB54CE0FAF3B5E00AB2F8D /* qgsattributetabledelegate.h in Sources */ = {isa = PBXBuildFile; fileRef = 72FB54C60FAF3A5D00AB2F8D /* qgsattributetabledelegate.h */; };
21922192
72FB54CF0FAF3B5E00AB2F8D /* qgsattributetablememorymodel.h in Sources */ = {isa = PBXBuildFile; fileRef = 72FB54C20FAF3A5D00AB2F8D /* qgsattributetablememorymodel.h */; };
21932193
72FE24C7105BE1B50026B6CB /* CONTRIBUTORS in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7256F2E30F4147890022BE1F /* CONTRIBUTORS */; };
2194+
72FE54371269EB1C0069DFA1 /* admin.sld in Copy - support */ = {isa = PBXBuildFile; fileRef = 72DBBCD212217A2200384557 /* admin.sld */; };
2195+
72FE54381269EB1C0069DFA1 /* wms_metadata.xml in Copy - support */ = {isa = PBXBuildFile; fileRef = 72DBBD0F12217A2200384557 /* wms_metadata.xml */; };
21942196
72FEE38B111D31AC00D28C1A /* libqgisgrass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72A07E3A0F3BEE16004FC2A4 /* libqgisgrass.dylib */; };
21952197
72FEE39B111D31D000D28C1A /* qgsgrassrasterprovider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72FEE382111D314200D28C1A /* qgsgrassrasterprovider.cpp */; };
21962198
72FEE3A1111D32BE00D28C1A /* libqgis_core.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F1D20F39E760003DC336 /* libqgis_core.dylib */; };
@@ -2979,7 +2981,7 @@
29792981
isa = PBXContainerItemProxy;
29802982
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
29812983
proxyType = 1;
2982-
remoteGlobalIDString = 72448A4D125D3D290071B130 /* offlineeditingplugin */;
2984+
remoteGlobalIDString = 72448A4D125D3D290071B130;
29832985
remoteInfo = offlineeditingplugin;
29842986
};
29852987
7256F18F0F411B110022BE1F /* PBXContainerItemProxy */ = {
@@ -4648,6 +4650,18 @@
46484650
name = "Copy - doc";
46494651
runOnlyForDeploymentPostprocessing = 0;
46504652
};
4653+
72FE54361269EA830069DFA1 /* Copy - support */ = {
4654+
isa = PBXCopyFilesBuildPhase;
4655+
buildActionMask = 2147483647;
4656+
dstPath = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_CGIBIN_SUBDIR)";
4657+
dstSubfolderSpec = 0;
4658+
files = (
4659+
72FE54371269EB1C0069DFA1 /* admin.sld in Copy - support */,
4660+
72FE54381269EB1C0069DFA1 /* wms_metadata.xml in Copy - support */,
4661+
);
4662+
name = "Copy - support";
4663+
runOnlyForDeploymentPostprocessing = 0;
4664+
};
46514665
/* End PBXCopyFilesBuildPhase section */
46524666

46534667
/* Begin PBXFileReference section */
@@ -7212,6 +7226,10 @@
72127226
7258080B1225F13A006B150F /* transport_tram_stop.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = transport_tram_stop.svg; path = ../../images/svg/transport/transport_tram_stop.svg; sourceTree = SOURCE_ROOT; };
72137227
725B4FEF0F936E1700084072 /* qgsrunprocess.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsrunprocess.sip; path = ../../python/core/qgsrunprocess.sip; sourceTree = SOURCE_ROOT; };
72147228
725B4FF00F936E3300084072 /* qgsmaptip.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsmaptip.sip; path = ../../python/gui/qgsmaptip.sip; sourceTree = SOURCE_ROOT; };
7229+
725C5E7512655621005DECF2 /* qgsattributeselectiondialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = qgsattributeselectiondialogbase.ui; path = ../../src/ui/qgsattributeselectiondialogbase.ui; sourceTree = SOURCE_ROOT; };
7230+
725C5E761265565E005DECF2 /* g.proj.wkt.1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = g.proj.wkt.1.png; path = "../../src/plugins/grass/modules-6.4/g.proj.wkt.1.png"; sourceTree = SOURCE_ROOT; };
7231+
725C5E771265565E005DECF2 /* g.proj.wkt.2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = g.proj.wkt.2.png; path = "../../src/plugins/grass/modules-6.4/g.proj.wkt.2.png"; sourceTree = SOURCE_ROOT; };
7232+
725C5E781265565E005DECF2 /* g.proj.wkt.qgm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = g.proj.wkt.qgm; path = "../../src/plugins/grass/modules-6.4/g.proj.wkt.qgm"; sourceTree = SOURCE_ROOT; };
72157233
7261A9B31195BB3F006BD962 /* qgsresidualplotitem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsresidualplotitem.cpp; path = ../../src/plugins/georeferencer/qgsresidualplotitem.cpp; sourceTree = SOURCE_ROOT; };
72167234
7261A9B41195BB3F006BD962 /* qgsresidualplotitem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsresidualplotitem.h; path = ../../src/plugins/georeferencer/qgsresidualplotitem.h; sourceTree = SOURCE_ROOT; };
72177235
7261EF9811F2588100E4C6E2 /* QgsWMSSourceSelect-pl_PL */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "QgsWMSSourceSelect-pl_PL"; path = "../../resources/context_help/QgsWMSSourceSelect-pl_PL"; sourceTree = SOURCE_ROOT; };
@@ -9062,6 +9080,9 @@
90629080
72FB54C70FAF3A5D00AB2F8D /* qgsattributetableidcolumnpair.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsattributetableidcolumnpair.cpp; path = ../../src/app/attributetable/qgsattributetableidcolumnpair.cpp; sourceTree = SOURCE_ROOT; };
90639081
72FB54C80FAF3A5D00AB2F8D /* qgsattributetablefiltermodel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsattributetablefiltermodel.cpp; path = ../../src/app/attributetable/qgsattributetablefiltermodel.cpp; sourceTree = SOURCE_ROOT; };
90649082
72FDF1640FB4720400580178 /* DONORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DONORS; path = ../../DONORS; sourceTree = SOURCE_ROOT; };
9083+
72FE54311269EA330069DFA1 /* r.external.2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = r.external.2.png; path = "../../src/plugins/grass/modules-6.4/r.external.2.png"; sourceTree = SOURCE_ROOT; };
9084+
72FE54321269EA330069DFA1 /* r.external.all.2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = r.external.all.2.png; path = "../../src/plugins/grass/modules-6.4/r.external.all.2.png"; sourceTree = SOURCE_ROOT; };
9085+
72FE54331269EA330069DFA1 /* r.external.qgis.2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = r.external.qgis.2.png; path = "../../src/plugins/grass/modules-6.4/r.external.qgis.2.png"; sourceTree = SOURCE_ROOT; };
90659086
72FEE380111D314200D28C1A /* qgis.d.rast.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = qgis.d.rast.c; path = ../../src/providers/grass/qgis.d.rast.c; sourceTree = SOURCE_ROOT; };
90669087
72FEE381111D314200D28C1A /* qgis.g.info.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = qgis.g.info.c; path = ../../src/providers/grass/qgis.g.info.c; sourceTree = SOURCE_ROOT; };
90679088
72FEE382111D314200D28C1A /* qgsgrassrasterprovider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsgrassrasterprovider.cpp; path = ../../src/providers/grass/qgsgrassrasterprovider.cpp; sourceTree = SOURCE_ROOT; };
@@ -11268,6 +11289,7 @@
1126811289
7209EC8C0F39E57B003DC336 /* qgsattributeactiondialogbase.ui */,
1126911290
72D0A53F1018975800EE6279 /* qgsattributetypeedit.ui */,
1127011291
72D0A5401018975800EE6279 /* qgsattributeloadfrommap.ui */,
11292+
725C5E7512655621005DECF2 /* qgsattributeselectiondialogbase.ui */,
1127111293
72442AE81095DCD800B54796 /* qgsavoidintersectionsdialogbase.ui */,
1127211294
7209EC8F0F39E57B003DC336 /* qgsbookmarksbase.ui */,
1127311295
7209EC900F39E57B003DC336 /* qgscomposerbase.ui */,
@@ -13914,6 +13936,9 @@
1391413936
72ACC818100E126A00894938 /* db.out.ogr.1.png */,
1391513937
72ACC81D100E126A00894938 /* db.out.ogr.2.png */,
1391613938
72ACC824100E126A00894938 /* db.out.ogr.qgm */,
13939+
725C5E761265565E005DECF2 /* g.proj.wkt.1.png */,
13940+
725C5E771265565E005DECF2 /* g.proj.wkt.2.png */,
13941+
725C5E781265565E005DECF2 /* g.proj.wkt.qgm */,
1391713942
729939F10FE3037600244D1A /* v.out.ogr.pg.1.png */,
1391813943
729939F20FE3037600244D1A /* v.out.ogr.pg.2.png */,
1391913944
729939F30FE3037600244D1A /* v.out.ogr.pg.qgm */,
@@ -13929,6 +13954,9 @@
1392913954
7299397F0FE3037600244D1A /* r.external.qgm */,
1393013955
72A6A45C1005995300855EA6 /* r.external.all.qgm */,
1393113956
72A6A45D1005995300855EA6 /* r.external.all.1.png */,
13957+
72FE54311269EA330069DFA1 /* r.external.2.png */,
13958+
72FE54321269EA330069DFA1 /* r.external.all.2.png */,
13959+
72FE54331269EA330069DFA1 /* r.external.qgis.2.png */,
1393213960
72ACC815100E126A00894938 /* r.grow.distance.2.png */,
1393313961
72ACC816100E126A00894938 /* r.grow.distance.1.png */,
1393413962
72ACC814100E126A00894938 /* r.grow.distance.qgm */,
@@ -16539,6 +16567,7 @@
1653916567
buildPhases = (
1654016568
72DBBD1612217BB000384557 /* Sources */,
1654116569
72DBBD1812217BB000384557 /* Frameworks */,
16570+
72FE54361269EA830069DFA1 /* Copy - support */,
1654216571
);
1654316572
buildRules = (
1654416573
72DBBD7F1221941200384557 /* PBXBuildRule */,
@@ -16679,7 +16708,14 @@
1667916708
isa = PBXProject;
1668016709
buildConfigurationList = C0E91AC908A95435008D54AB /* Build configuration list for PBXProject "Qgis" */;
1668116710
compatibilityVersion = "Xcode 2.4";
16711+
developmentRegion = English;
1668216712
hasScannedForEncodings = 1;
16713+
knownRegions = (
16714+
English,
16715+
Japanese,
16716+
French,
16717+
German,
16718+
);
1668316719
mainGroup = 20286C29FDCF999611CA2CEA /* Qgis */;
1668416720
projectDirPath = "";
1668516721
projectRoot = "";

‎mac/xcode/qgis_settings.xcconfig

+5-4
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,15 @@ QGIS_PREFIX = $(QGIS_APP_NAME)/Contents
186186
QGIS_INSTALL_PATH = $(INSTALL_PREFIX)/$(QGIS_PREFIX)
187187
QGIS_BUILD_PATH = $(PROJECT_TARGET_DIR)/$(QGIS_PREFIX)
188188
// subdirs are relative to MacOS dir, as if MacOS is unix "prefix"
189-
QGIS_BIN_SUBDIR = bin // leave this alone for now
189+
// _REV dirs for backing out in relative paths, match depth of _SUBDIR
190+
QGIS_BIN_SUBDIR = bin
190191
QGIS_FW_SUBDIR = ../Frameworks
191-
QGIS_LIB_SUBDIR = lib // qgispython lib MUST be in MacOS/lib
192+
QGIS_LIB_SUBDIR = lib
192193
QGIS_DATA_SUBDIR = ../Resources
193194
QGIS_PLUGIN_SUBDIR = ../PlugIns/qgis
194195
QGIS_LIBEXEC_SUBDIR = lib/gqis
195-
QGIS_LIBEXEC_SUBDIR_REV = ../.. // for backing out in relative paths, match depth of _SUBDIR above
196-
QGIS_CGIBIN_SUBDIR = bin
196+
QGIS_LIBEXEC_SUBDIR_REV = ../..
197+
QGIS_CGIBIN_SUBDIR = qgis-mapserver
197198
QGIS_CGIBIN_SUBDIR_REV = ..
198199

199200
QGIS_HEADER_SEARCH_BASE = $(SYMROOT)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/include

0 commit comments

Comments
 (0)