Skip to content

Commit 2bcc718

Browse files
Codym48jef-n
authored andcommittedMay 11, 2020
Regenerate INSTALL[.html] with txt2tags 3.6 including Mac changes
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
1 parent e60911f commit 2bcc718

File tree

2 files changed

+732
-1747
lines changed

2 files changed

+732
-1747
lines changed
 

‎INSTALL

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1205,6 +1205,7 @@ As minimum you require command line tools
12051205

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

1208+
12081209
5.2. Install CMake and other build tools
12091210
========================================
12101211

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

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

1294+
cd ..
12931295
mkdir build
12941296
cd build
12951297

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

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

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

‎doc/INSTALL.html

Lines changed: 729 additions & 1746 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.