Skip to content

Commit

Permalink
Regenerate INSTALL[.html] with txt2tags 3.6 including Mac changes
Browse files Browse the repository at this point in the history
From C:\OSGeo4W64 with the 3.6 tag of txt2tags checked out
at C:\OSGeo4W64\tx2tags and this branch of QGIS checked out
at C:\OSGeo4W64\QGIS, call:

python txt2tags\txt2tags.py -oQGIS\INSTALL -t txt QGIS\doc\INSTALL.t2t
python txt2tags\txt2tags.py -oQGIS\doc\INSTALL.html -t html QGIS\doc\INSTALL.t2t
  • Loading branch information
Codym48 authored and jef-n committed May 11, 2020
1 parent e60911f commit 2bcc718
Show file tree
Hide file tree
Showing 2 changed files with 732 additions and 1,747 deletions.
4 changes: 3 additions & 1 deletion INSTALL
Expand Up @@ -1205,6 +1205,7 @@ As minimum you require command line tools

but installation of Xcode from the App Store is recommended too.


5.2. Install CMake and other build tools
========================================

Expand Down Expand Up @@ -1290,6 +1291,7 @@ below assume you are building into a ${HOME}/Applications directory.

In a Terminal cd to the qgis source folder previously downloaded, then:

cd ..
mkdir build
cd build

Expand All @@ -1303,7 +1305,7 @@ In a Terminal cd to the qgis source folder previously downloaded, then:
-DCMAKE_PREFIX_PATH=/opt/Qt/${QT_VERSION}/clang_64 \
../QGIS

Note: Don't forget the ../QGIS on the last line, which tells CMake to look for the source files.
Note: Don't forget the `../QGIS` on the last line, which tells CMake to look for the source files.

Note: Double check on the screen output that all libraries are picked from QGIS-Deps `/opt/QGIS`
and not from system `/usr/lib` or Homebrew's `/usr/local/` or system Frameworks `/Library/Frameworks/`.
Expand Down

0 comments on commit 2bcc718

Please sign in to comment.