Skip to content

Commit ed29f59

Browse files
author
kyngchaos
committed
tolerance (r10478), spatialite (r10473) updates (spatialite sources added to project, but not integrated in build yet)
git-svn-id: http://svn.osgeo.org/qgis/trunk@10479 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 2b08dfd commit ed29f59

File tree

1 file changed

+185
-0
lines changed

1 file changed

+185
-0
lines changed

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

+185
Original file line numberDiff line numberDiff line change
@@ -2386,6 +2386,7 @@
23862386
72EBCB3B0F49E8240016BA3C /* favicon.ico in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7209F0160F39E5DA003DC336 /* favicon.ico */; };
23872387
72EBCB3C0F49E8240016BA3C /* index.html in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7209F01B0F39E5DA003DC336 /* index.html */; };
23882388
72EBCB3D0F49E8240016BA3C /* qgisdoc.css in Copy - doc */ = {isa = PBXBuildFile; fileRef = 7209F0370F39E5DA003DC336 /* qgisdoc.css */; };
2389+
72F8D9450F89251100D10CE5 /* qgstolerance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72F8D9430F8924F100D10CE5 /* qgstolerance.cpp */; };
23892390
/* End PBXBuildFile section */
23902391

23912392
/* Begin PBXBuildRule section */
@@ -8272,6 +8273,39 @@
82728273
72EBCA650F49DC130016BA3C /* frmVisual.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = frmVisual.ui; path = ../../python/plugins/fTools/tools/frmVisual.ui; sourceTree = SOURCE_ROOT; };
82738274
72EBCA660F49DC130016BA3C /* ftools_utils.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = ftools_utils.py; path = ../../python/plugins/fTools/tools/ftools_utils.py; sourceTree = SOURCE_ROOT; };
82748275
72F117AB0F73DB1A00D68564 /* tsstat.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = tsstat.pl; path = ../../scripts/tsstat.pl; sourceTree = SOURCE_ROOT; };
8276+
72F8D9350F89234600D10CE5 /* FindIconv.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = FindIconv.cmake; path = ../../cmake/FindIconv.cmake; sourceTree = SOURCE_ROOT; };
8277+
72F8D9390F8924AE00D10CE5 /* qgstolerance.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgstolerance.sip; path = ../../python/core/qgstolerance.sip; sourceTree = SOURCE_ROOT; };
8278+
72F8D9420F8924F100D10CE5 /* qgstolerance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgstolerance.h; path = ../../src/core/qgstolerance.h; sourceTree = SOURCE_ROOT; };
8279+
72F8D9430F8924F100D10CE5 /* qgstolerance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgstolerance.cpp; path = ../../src/core/qgstolerance.cpp; sourceTree = SOURCE_ROOT; };
8280+
72F8D9460F89264000D10CE5 /* qgis_he.ts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgis_he.ts; path = ../../i18n/qgis_he.ts; sourceTree = SOURCE_ROOT; };
8281+
72F8D9490F89268C00D10CE5 /* gaia_exif.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gaia_exif.c; path = ../../src/core/spatialite/gaiaexif/gaia_exif.c; sourceTree = SOURCE_ROOT; };
8282+
72F8D94B0F89268C00D10CE5 /* gg_advanced.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_advanced.c; path = ../../src/core/spatialite/gaiageo/gg_advanced.c; sourceTree = SOURCE_ROOT; };
8283+
72F8D94C0F89268C00D10CE5 /* gg_endian.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_endian.c; path = ../../src/core/spatialite/gaiageo/gg_endian.c; sourceTree = SOURCE_ROOT; };
8284+
72F8D94D0F89268C00D10CE5 /* gg_geometries.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_geometries.c; path = ../../src/core/spatialite/gaiageo/gg_geometries.c; sourceTree = SOURCE_ROOT; };
8285+
72F8D94E0F89268C00D10CE5 /* gg_relations.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_relations.c; path = ../../src/core/spatialite/gaiageo/gg_relations.c; sourceTree = SOURCE_ROOT; };
8286+
72F8D94F0F89268C00D10CE5 /* gg_shape.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_shape.c; path = ../../src/core/spatialite/gaiageo/gg_shape.c; sourceTree = SOURCE_ROOT; };
8287+
72F8D9500F89268C00D10CE5 /* gg_transform.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_transform.c; path = ../../src/core/spatialite/gaiageo/gg_transform.c; sourceTree = SOURCE_ROOT; };
8288+
72F8D9510F89268C00D10CE5 /* gg_wkb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_wkb.c; path = ../../src/core/spatialite/gaiageo/gg_wkb.c; sourceTree = SOURCE_ROOT; };
8289+
72F8D9520F89268C00D10CE5 /* gg_wkt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_wkt.c; path = ../../src/core/spatialite/gaiageo/gg_wkt.c; sourceTree = SOURCE_ROOT; };
8290+
72F8D9550F89268C00D10CE5 /* gaiaaux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gaiaaux.h; path = ../../src/core/spatialite/headers/spatialite/gaiaaux.h; sourceTree = SOURCE_ROOT; };
8291+
72F8D9560F89268C00D10CE5 /* gaiaexif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gaiaexif.h; path = ../../src/core/spatialite/headers/spatialite/gaiaexif.h; sourceTree = SOURCE_ROOT; };
8292+
72F8D9570F89268C00D10CE5 /* gaiageo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gaiageo.h; path = ../../src/core/spatialite/headers/spatialite/gaiageo.h; sourceTree = SOURCE_ROOT; };
8293+
72F8D9580F89268C00D10CE5 /* spatialite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = spatialite.h; path = ../../src/core/spatialite/headers/spatialite/spatialite.h; sourceTree = SOURCE_ROOT; };
8294+
72F8D9590F89268C00D10CE5 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../../src/core/spatialite/headers/spatialite/sqlite3.h; sourceTree = SOURCE_ROOT; };
8295+
72F8D95A0F89268C00D10CE5 /* sqlite3ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3ext.h; path = ../../src/core/spatialite/headers/spatialite/sqlite3ext.h; sourceTree = SOURCE_ROOT; };
8296+
72F8D95B0F89268C00D10CE5 /* spatialite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = spatialite.h; path = ../../src/core/spatialite/headers/spatialite.h; sourceTree = SOURCE_ROOT; };
8297+
72F8D95D0F89268C00D10CE5 /* mbrcache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mbrcache.c; path = ../../src/core/spatialite/spatialite/mbrcache.c; sourceTree = SOURCE_ROOT; };
8298+
72F8D95E0F89268C00D10CE5 /* spatialite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = spatialite.c; path = ../../src/core/spatialite/spatialite/spatialite.c; sourceTree = SOURCE_ROOT; };
8299+
72F8D95F0F89268C00D10CE5 /* virtualfdo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = virtualfdo.c; path = ../../src/core/spatialite/spatialite/virtualfdo.c; sourceTree = SOURCE_ROOT; };
8300+
72F8D9600F89268C00D10CE5 /* virtualnetwork.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = virtualnetwork.c; path = ../../src/core/spatialite/spatialite/virtualnetwork.c; sourceTree = SOURCE_ROOT; };
8301+
72F8D9610F89268C00D10CE5 /* virtualshape.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = virtualshape.c; path = ../../src/core/spatialite/spatialite/virtualshape.c; sourceTree = SOURCE_ROOT; };
8302+
72F8D9630F89268C00D10CE5 /* spatialite_c99.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = spatialite_c99.c; path = ../../src/core/spatialite/spatialite_c99/spatialite_c99.c; sourceTree = SOURCE_ROOT; };
8303+
72F8D9650F89268C00D10CE5 /* version.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = version.c; path = ../../src/core/spatialite/versioninfo/version.c; sourceTree = SOURCE_ROOT; };
8304+
72F8D9680F89268C00D10CE5 /* gg_sqlaux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_sqlaux.c; path = ../../src/core/spatialite/virtualtext/gaiaaux/gg_sqlaux.c; sourceTree = SOURCE_ROOT; };
8305+
72F8D9690F89268C00D10CE5 /* gg_utf8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gg_utf8.c; path = ../../src/core/spatialite/virtualtext/gaiaaux/gg_utf8.c; sourceTree = SOURCE_ROOT; };
8306+
72F8D96B0F89268C00D10CE5 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../../src/core/spatialite/virtualtext/sqlite3/sqlite3.c; sourceTree = SOURCE_ROOT; };
8307+
72F8D96D0F89268C00D10CE5 /* version.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = version.c; path = ../../src/core/spatialite/virtualtext/versiontext/version.c; sourceTree = SOURCE_ROOT; };
8308+
72F8D96F0F89268C00D10CE5 /* virtualtext.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = virtualtext.c; path = ../../src/core/spatialite/virtualtext/virtualtext/virtualtext.c; sourceTree = SOURCE_ROOT; };
82758309
8D0C4E960486CD37000505A6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
82768310
/* End PBXFileReference section */
82778311

@@ -8964,6 +8998,8 @@
89648998
7209E6D00F39E57A003DC336 /* qgssearchtreenode.h */,
89658999
7209E6D10F39E57A003DC336 /* qgssnapper.cpp */,
89669000
7209E6D20F39E57A003DC336 /* qgssnapper.h */,
9001+
72F8D9430F8924F100D10CE5 /* qgstolerance.cpp */,
9002+
72F8D9420F8924F100D10CE5 /* qgstolerance.h */,
89679003
7209E6D30F39E57A003DC336 /* qgsvectordataprovider.cpp */,
89689004
7209E6D40F39E57A003DC336 /* qgsvectordataprovider.h */,
89699005
7209E6D50F39E57A003DC336 /* qgsvectorfilewriter.cpp */,
@@ -8974,6 +9010,7 @@
89749010
7209E6D90F39E57A003DC336 /* raster */,
89759011
7209E6F50F39E57A003DC336 /* renderer */,
89769012
7209E7000F39E57A003DC336 /* spatialindex */,
9013+
72F8D9470F89268C00D10CE5 /* spatialite */,
89779014
7209E7320F39E57A003DC336 /* sqlite3 */,
89789015
7209E7360F39E57A003DC336 /* symbology */,
89799016
7209E6620F39E57A003DC336 /* CMakeLists.txt */,
@@ -11288,6 +11325,7 @@
1128811325
7209EDB60F39E5D9003DC336 /* qgsspatialindex.sip */,
1128911326
7209EDB70F39E5D9003DC336 /* qgssymbol.sip */,
1129011327
7209EDB80F39E5D9003DC336 /* qgssymbologyutils.sip */,
11328+
72F8D9390F8924AE00D10CE5 /* qgstolerance.sip */,
1129111329
7209EDB90F39E5D9003DC336 /* qgsuniquevaluerenderer.sip */,
1129211330
7209EDBA0F39E5D9003DC336 /* qgsvectordataprovider.sip */,
1129311331
7209EDBB0F39E5D9003DC336 /* qgsvectorfilewriter.sip */,
@@ -12029,6 +12067,7 @@
1202912067
7209EFDC0F39E5D9003DC336 /* qgis_el_GR.ts */,
1203012068
7209EFDD0F39E5D9003DC336 /* qgis_es.ts */,
1203112069
7209EFDE0F39E5D9003DC336 /* qgis_fr.ts */,
12070+
72F8D9460F89264000D10CE5 /* qgis_he.ts */,
1203212071
7209EFDF0F39E5D9003DC336 /* qgis_hu.ts */,
1203312072
7209EFE00F39E5D9003DC336 /* qgis_id.ts */,
1203412073
7209EFE10F39E5D9003DC336 /* qgis_it.ts */,
@@ -12077,6 +12116,7 @@
1207712116
7209F0050F39E5DA003DC336 /* FindGEOS.cmake */,
1207812117
7209F0060F39E5DA003DC336 /* FindGRASS.cmake */,
1207912118
7209F0070F39E5DA003DC336 /* FindGSL.cmake */,
12119+
72F8D9350F89234600D10CE5 /* FindIconv.cmake */,
1208012120
7209F0080F39E5DA003DC336 /* FindPostgres.cmake */,
1208112121
7209F0090F39E5DA003DC336 /* FindProj.cmake */,
1208212122
7209F00A0F39E5DA003DC336 /* FindSqlite3.cmake */,
@@ -12500,6 +12540,150 @@
1250012540
path = ../../python/plugins/fTools/tools;
1250112541
sourceTree = SOURCE_ROOT;
1250212542
};
12543+
72F8D9470F89268C00D10CE5 /* spatialite */ = {
12544+
isa = PBXGroup;
12545+
children = (
12546+
72F8D9480F89268C00D10CE5 /* gaiaexif */,
12547+
72F8D94A0F89268C00D10CE5 /* gaiageo */,
12548+
72F8D9530F89268C00D10CE5 /* headers */,
12549+
72F8D95C0F89268C00D10CE5 /* spatialite */,
12550+
72F8D9620F89268C00D10CE5 /* spatialite_c99 */,
12551+
72F8D9640F89268C00D10CE5 /* versioninfo */,
12552+
72F8D9660F89268C00D10CE5 /* virtualtext */,
12553+
);
12554+
name = spatialite;
12555+
path = ../../src/core/spatialite;
12556+
sourceTree = SOURCE_ROOT;
12557+
};
12558+
72F8D9480F89268C00D10CE5 /* gaiaexif */ = {
12559+
isa = PBXGroup;
12560+
children = (
12561+
72F8D9490F89268C00D10CE5 /* gaia_exif.c */,
12562+
);
12563+
name = gaiaexif;
12564+
path = ../../src/core/spatialite/gaiaexif;
12565+
sourceTree = SOURCE_ROOT;
12566+
};
12567+
72F8D94A0F89268C00D10CE5 /* gaiageo */ = {
12568+
isa = PBXGroup;
12569+
children = (
12570+
72F8D94B0F89268C00D10CE5 /* gg_advanced.c */,
12571+
72F8D94C0F89268C00D10CE5 /* gg_endian.c */,
12572+
72F8D94D0F89268C00D10CE5 /* gg_geometries.c */,
12573+
72F8D94E0F89268C00D10CE5 /* gg_relations.c */,
12574+
72F8D94F0F89268C00D10CE5 /* gg_shape.c */,
12575+
72F8D9500F89268C00D10CE5 /* gg_transform.c */,
12576+
72F8D9510F89268C00D10CE5 /* gg_wkb.c */,
12577+
72F8D9520F89268C00D10CE5 /* gg_wkt.c */,
12578+
);
12579+
name = gaiageo;
12580+
path = ../../src/core/spatialite/gaiageo;
12581+
sourceTree = SOURCE_ROOT;
12582+
};
12583+
72F8D9530F89268C00D10CE5 /* headers */ = {
12584+
isa = PBXGroup;
12585+
children = (
12586+
72F8D9540F89268C00D10CE5 /* spatialite */,
12587+
72F8D95B0F89268C00D10CE5 /* spatialite.h */,
12588+
);
12589+
name = headers;
12590+
path = ../../src/core/spatialite/headers;
12591+
sourceTree = SOURCE_ROOT;
12592+
};
12593+
72F8D9540F89268C00D10CE5 /* spatialite */ = {
12594+
isa = PBXGroup;
12595+
children = (
12596+
72F8D9550F89268C00D10CE5 /* gaiaaux.h */,
12597+
72F8D9560F89268C00D10CE5 /* gaiaexif.h */,
12598+
72F8D9570F89268C00D10CE5 /* gaiageo.h */,
12599+
72F8D9580F89268C00D10CE5 /* spatialite.h */,
12600+
72F8D9590F89268C00D10CE5 /* sqlite3.h */,
12601+
72F8D95A0F89268C00D10CE5 /* sqlite3ext.h */,
12602+
);
12603+
name = spatialite;
12604+
path = ../../src/core/spatialite/headers/spatialite;
12605+
sourceTree = SOURCE_ROOT;
12606+
};
12607+
72F8D95C0F89268C00D10CE5 /* spatialite */ = {
12608+
isa = PBXGroup;
12609+
children = (
12610+
72F8D95D0F89268C00D10CE5 /* mbrcache.c */,
12611+
72F8D95E0F89268C00D10CE5 /* spatialite.c */,
12612+
72F8D95F0F89268C00D10CE5 /* virtualfdo.c */,
12613+
72F8D9600F89268C00D10CE5 /* virtualnetwork.c */,
12614+
72F8D9610F89268C00D10CE5 /* virtualshape.c */,
12615+
);
12616+
name = spatialite;
12617+
path = ../../src/core/spatialite/spatialite;
12618+
sourceTree = SOURCE_ROOT;
12619+
};
12620+
72F8D9620F89268C00D10CE5 /* spatialite_c99 */ = {
12621+
isa = PBXGroup;
12622+
children = (
12623+
72F8D9630F89268C00D10CE5 /* spatialite_c99.c */,
12624+
);
12625+
name = spatialite_c99;
12626+
path = ../../src/core/spatialite/spatialite_c99;
12627+
sourceTree = SOURCE_ROOT;
12628+
};
12629+
72F8D9640F89268C00D10CE5 /* versioninfo */ = {
12630+
isa = PBXGroup;
12631+
children = (
12632+
72F8D9650F89268C00D10CE5 /* version.c */,
12633+
);
12634+
name = versioninfo;
12635+
path = ../../src/core/spatialite/versioninfo;
12636+
sourceTree = SOURCE_ROOT;
12637+
};
12638+
72F8D9660F89268C00D10CE5 /* virtualtext */ = {
12639+
isa = PBXGroup;
12640+
children = (
12641+
72F8D9670F89268C00D10CE5 /* gaiaaux */,
12642+
72F8D96A0F89268C00D10CE5 /* sqlite3 */,
12643+
72F8D96C0F89268C00D10CE5 /* versiontext */,
12644+
72F8D96E0F89268C00D10CE5 /* virtualtext */,
12645+
);
12646+
name = virtualtext;
12647+
path = ../../src/core/spatialite/virtualtext;
12648+
sourceTree = SOURCE_ROOT;
12649+
};
12650+
72F8D9670F89268C00D10CE5 /* gaiaaux */ = {
12651+
isa = PBXGroup;
12652+
children = (
12653+
72F8D9680F89268C00D10CE5 /* gg_sqlaux.c */,
12654+
72F8D9690F89268C00D10CE5 /* gg_utf8.c */,
12655+
);
12656+
name = gaiaaux;
12657+
path = ../../src/core/spatialite/virtualtext/gaiaaux;
12658+
sourceTree = SOURCE_ROOT;
12659+
};
12660+
72F8D96A0F89268C00D10CE5 /* sqlite3 */ = {
12661+
isa = PBXGroup;
12662+
children = (
12663+
72F8D96B0F89268C00D10CE5 /* sqlite3.c */,
12664+
);
12665+
name = sqlite3;
12666+
path = ../../src/core/spatialite/virtualtext/sqlite3;
12667+
sourceTree = SOURCE_ROOT;
12668+
};
12669+
72F8D96C0F89268C00D10CE5 /* versiontext */ = {
12670+
isa = PBXGroup;
12671+
children = (
12672+
72F8D96D0F89268C00D10CE5 /* version.c */,
12673+
);
12674+
name = versiontext;
12675+
path = ../../src/core/spatialite/virtualtext/versiontext;
12676+
sourceTree = SOURCE_ROOT;
12677+
};
12678+
72F8D96E0F89268C00D10CE5 /* virtualtext */ = {
12679+
isa = PBXGroup;
12680+
children = (
12681+
72F8D96F0F89268C00D10CE5 /* virtualtext.c */,
12682+
);
12683+
name = virtualtext;
12684+
path = ../../src/core/spatialite/virtualtext/virtualtext;
12685+
sourceTree = SOURCE_ROOT;
12686+
};
1250312687
/* End PBXGroup section */
1250412688

1250512689
/* Begin PBXHeadersBuildPhase section */
@@ -13873,6 +14057,7 @@
1387314057
729287540F71C2CB006D9489 /* qgsrasterlayer.h in Sources */,
1387414058
729287550F71C2CB006D9489 /* qgsrunprocess.h in Sources */,
1387514059
729287560F71C2CB006D9489 /* qgsvectorlayer.h in Sources */,
14060+
72F8D9450F89251100D10CE5 /* qgstolerance.cpp in Sources */,
1387614061
);
1387714062
runOnlyForDeploymentPostprocessing = 0;
1387814063
};

0 commit comments

Comments
 (0)