Skip to content

Commit

Permalink
Small update to Mac notes in INSTALL
Browse files Browse the repository at this point in the history
  • Loading branch information
dakcarto committed Apr 24, 2013
1 parent db762dd commit 154b750
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 22 deletions.
20 changes: 12 additions & 8 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Quantum GIS (QGIS)
Building QGIS from source - step by step
Sunday April 07, 2013
Wednesday April 24, 2013


Last Updated: Sunday April 07, 2013
Last Change : Saturday December 08, 2012
Last Updated: Wednesday April 24, 2013


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

Xcode 4.4+ note: You will probably not need to install ccache if you are using
the clang frontend to LLVM compiler, a setup that already provides fairly quick
compile times.

Setup ccache to significantly speed up compile times after initial build.
(Switching git branches will again cause longer initial build times unless
separate build directories are used for each branch.)
Expand Down Expand Up @@ -1885,8 +1889,8 @@ In a Terminal cd to the qgis source folder previously downloaded, then:
-D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_PYSPATIALITE=FALSE \
-D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
-D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
-D QWT_LIBRARY=/usr/local/qwt-5.2.2/lib/libqwt.dylib \
-D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.2/include \
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/include \
-D BISON_EXECUTABLE=/usr/local/bin/bison \
..

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

This will automatically find and use the previously installed frameworks, and
the GRASS application if installed. Remember to change the Qwt version if a
different version was installed, and possibly paths, e.g. for Qwt 6.0.1, which
installs as a framework, use:
different version was installed, and possibly paths, e.g. for Qwt 6.0.2 installed
as a framework use:

-D QWT_LIBRARY=/usr/local/qwt-6.0.1/lib/qwt.framework/qwt \
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.1/lib/qwt.framework/Headers \
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/qwt.framework/qwt \
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/lib/qwt.framework/Headers \

If you want to use a newer PostgreSQL client than the default Mac OS X version,
e.g. install from kyngchaos.com, set the following option to pg_config's path:
Expand Down
21 changes: 13 additions & 8 deletions doc/INSTALL.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@
<DIV CLASS="header" ID="header">
<H1>Quantum GIS (QGIS)</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Sunday April 07, 2013</H3>
<H3>Wednesday April 24, 2013</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Sunday April 07, 2013
Last Change : Saturday December 08, 2012
Last Updated: Wednesday April 24, 2013
</P>
<DIV CLASS="toc">

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

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

<P>
<U>Xcode 4.4+ note:</U> You will probably not need to install ccache if you are using
the clang frontend to LLVM compiler, a setup that already provides fairly quick
compile times.
</P>
<P>
Setup ccache to significantly speed up compile times after initial build.
(Switching git branches will again cause longer initial build times unless
Expand Down Expand Up @@ -2642,8 +2647,8 @@ <H2>5.7. Configure the build</H2>
-D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_PYSPATIALITE=FALSE \
-D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
-D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
-D QWT_LIBRARY=/usr/local/qwt-5.2.2/lib/libqwt.dylib \
-D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.2/include \
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/include \
-D BISON_EXECUTABLE=/usr/local/bin/bison \
..
</PRE></div>
Expand All @@ -2664,13 +2669,13 @@ <H2>5.7. Configure the build</H2>
<P>
This will automatically find and use the previously installed frameworks, and
the GRASS application if installed. Remember to change the Qwt version if a
different version was installed, and possibly paths, e.g. for Qwt 6.0.1, which
installs as a framework, use:
different version was installed, and possibly paths, e.g. for Qwt 6.0.2 installed
as a framework use:
</P>

<div class="code"><PRE>
-D QWT_LIBRARY=/usr/local/qwt-6.0.1/lib/qwt.framework/qwt \
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.1/lib/qwt.framework/Headers \
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/qwt.framework/qwt \
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/lib/qwt.framework/Headers \
</PRE></div>

<P>
Expand Down
16 changes: 10 additions & 6 deletions doc/osx.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,10 @@ sudo make install

=== Optional setup: ccache ===

__Xcode 4.4+ note:__ You will probably not need to install ccache if you are using
the clang frontend to LLVM compiler, a setup that already provides fairly quick
compile times.

Setup ccache to significantly speed up compile times after initial build.
(Switching git branches will again cause longer initial build times unless
separate build directories are used for each branch.)
Expand Down Expand Up @@ -777,8 +781,8 @@ cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
-D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_PYSPATIALITE=FALSE \
-D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
-D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
-D QWT_LIBRARY=/usr/local/qwt-5.2.2/lib/libqwt.dylib \
-D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.2/include \
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/include \
-D BISON_EXECUTABLE=/usr/local/bin/bison \
..
```
Expand All @@ -795,12 +799,12 @@ ccmake ..

This will automatically find and use the previously installed frameworks, and
the GRASS application if installed. Remember to change the Qwt version if a
different version was installed, and possibly paths, e.g. for Qwt 6.0.1, which
installs as a framework, use:
different version was installed, and possibly paths, e.g. for Qwt 6.0.2 installed
as a framework use:

```
-D QWT_LIBRARY=/usr/local/qwt-6.0.1/lib/qwt.framework/qwt \
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.1/lib/qwt.framework/Headers \
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/qwt.framework/qwt \
-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/lib/qwt.framework/Headers \
```

If you want to use a newer PostgreSQL client than the default Mac OS X version,
Expand Down

0 comments on commit 154b750

Please sign in to comment.