Skip to content

Commit eb220fd

Browse files
ccrookccrook
committedApr 26, 2013
Merge branch 'master' into delimited_text_bug_fixes_2
·
ltr-3_40archive/master_2
2 parents 7603f3e + b57841f commit eb220fd

File tree

1,014 files changed

+40700
-4884
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,014 files changed

+40700
-4884
lines changed
 

‎INSTALL

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Quantum GIS (QGIS)
22
Building QGIS from source - step by step
3-
Sunday April 07, 2013
3+
Wednesday April 24, 2013
44

55

6-
Last Updated: Sunday April 07, 2013
76
Last Change : Saturday December 08, 2012
7+
Last Updated: Wednesday April 24, 2013
88

99

1010
1. Introduction
@@ -1312,6 +1312,10 @@ Double-click the source tarball to unpack it, then cd to the source folder and:
13121312
5.3.1. Optional setup: ccache
13131313
=============================
13141314

1315+
Xcode 4.4+ note: You will probably not need to install ccache if you are using
1316+
the clang frontend to LLVM compiler, a setup that already provides fairly quick
1317+
compile times.
1318+
13151319
Setup ccache to significantly speed up compile times after initial build.
13161320
(Switching git branches will again cause longer initial build times unless
13171321
separate build directories are used for each branch.)
@@ -1885,8 +1889,8 @@ In a Terminal cd to the qgis source folder previously downloaded, then:
18851889
-D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_PYSPATIALITE=FALSE \
18861890
-D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
18871891
-D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
1888-
-D QWT_LIBRARY=/usr/local/qwt-5.2.2/lib/libqwt.dylib \
1889-
-D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.2/include \
1892+
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \
1893+
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/include \
18901894
-D BISON_EXECUTABLE=/usr/local/bin/bison \
18911895
..
18921896

@@ -1900,11 +1904,11 @@ After the initial Terminal configure, you can use ccmake to make further changes
19001904

19011905
This will automatically find and use the previously installed frameworks, and
19021906
the GRASS application if installed. Remember to change the Qwt version if a
1903-
different version was installed, and possibly paths, e.g. for Qwt 6.0.1, which
1904-
installs as a framework, use:
1907+
different version was installed, and possibly paths, e.g. for Qwt 6.0.2 installed
1908+
as a framework use:
19051909

1906-
-D QWT_LIBRARY=/usr/local/qwt-6.0.1/lib/qwt.framework/qwt \
1907-
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.1/lib/qwt.framework/Headers \
1910+
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/qwt.framework/qwt \
1911+
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/lib/qwt.framework/Headers \
19081912

19091913
If you want to use a newer PostgreSQL client than the default Mac OS X version,
19101914
e.g. install from kyngchaos.com, set the following option to pg_config's path:

‎doc/INSTALL.html

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>Quantum GIS (QGIS)</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Sunday April 07, 2013</H3>
80+
<H3>Wednesday April 24, 2013</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Sunday April 07, 2013
8685
Last Change : Saturday December 08, 2012
86+
Last Updated: Wednesday April 24, 2013
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -1857,6 +1857,11 @@ <H2>5.3. Install CMake for OSX</H2>
18571857

18581858
<H3>5.3.1. Optional setup: ccache</H3>
18591859

1860+
<P>
1861+
<U>Xcode 4.4+ note:</U> You will probably not need to install ccache if you are using
1862+
the clang frontend to LLVM compiler, a setup that already provides fairly quick
1863+
compile times.
1864+
</P>
18601865
<P>
18611866
Setup ccache to significantly speed up compile times after initial build.
18621867
(Switching git branches will again cause longer initial build times unless
@@ -2642,8 +2647,8 @@ <H2>5.7. Configure the build</H2>
26422647
-D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_PYSPATIALITE=FALSE \
26432648
-D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
26442649
-D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
2645-
-D QWT_LIBRARY=/usr/local/qwt-5.2.2/lib/libqwt.dylib \
2646-
-D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.2/include \
2650+
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \
2651+
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/include \
26472652
-D BISON_EXECUTABLE=/usr/local/bin/bison \
26482653
..
26492654
</PRE></div>
@@ -2664,13 +2669,13 @@ <H2>5.7. Configure the build</H2>
26642669
<P>
26652670
This will automatically find and use the previously installed frameworks, and
26662671
the GRASS application if installed. Remember to change the Qwt version if a
2667-
different version was installed, and possibly paths, e.g. for Qwt 6.0.1, which
2668-
installs as a framework, use:
2672+
different version was installed, and possibly paths, e.g. for Qwt 6.0.2 installed
2673+
as a framework use:
26692674
</P>
26702675

26712676
<div class="code"><PRE>
2672-
-D QWT_LIBRARY=/usr/local/qwt-6.0.1/lib/qwt.framework/qwt \
2673-
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.1/lib/qwt.framework/Headers \
2677+
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/qwt.framework/qwt \
2678+
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/lib/qwt.framework/Headers \
26742679
</PRE></div>
26752680

26762681
<P>

0 commit comments

Comments
 (0)
Please sign in to comment.