update INSTALL.html

qgis · Aug 4, 2019 · 06b24d1 · 06b24d1
1 parent 7e0181b
commit 06b24d1
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 62 deletions.
diff --git a/INSTALL b/INSTALL
@@ -1,10 +1,10 @@
 QGIS
 Building QGIS from source - step by step
-Friday June 21, 2019
+Sunday August 04, 2019
 
 
-Last Updated: Friday June 21, 2019
-Last Change : Friday June 21, 2019
+Last Updated: Sunday August 04, 2019
+Last Change : Sunday August 04, 2019
 
 
   1. Introduction

diff --git a/cmake/FindProj.cmake b/cmake/FindProj.cmake
@@ -61,19 +61,19 @@ IF (PROJ_FOUND)
        MESSAGE (FATAL_ERROR "Cannot build QGIS using Proj ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH} Use 6.1.0 or higher.")
      ENDIF ((PROJ_VERSION_MAJOR EQUAL 6) AND (PROJ_VERSION_MINOR EQUAL 0))
    ELSE(EXISTS ${PROJ_INCLUDE_DIR}/proj.h)
-      FILE(READ ${PROJ_INCLUDE_DIR}/proj_api.h proj_version)
-      STRING(REGEX REPLACE "^.*PJ_VERSION ([0-9]+).*$" "\\1" PJ_VERSION "${proj_version}")
+     FILE(READ ${PROJ_INCLUDE_DIR}/proj_api.h proj_version)
+     STRING(REGEX REPLACE "^.*PJ_VERSION ([0-9]+).*$" "\\1" PJ_VERSION "${proj_version}")
 
-      # This will break if 4.10.0 ever will be released (highly unlikely)
-      STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\1" PROJ_VERSION_MAJOR "${PJ_VERSION}")
-      STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\2" PROJ_VERSION_MINOR "${PJ_VERSION}")
-      STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\3" PROJ_VERSION_PATCH "${PJ_VERSION}")
-      STRING(CONCAT PROJ_VERSION_STR "(" ${PROJ_VERSION_MAJOR} "." ${PROJ_VERSION_MINOR} "." ${PROJ_VERSION_PATCH} ")")
+     # This will break if 4.10.0 ever will be released (highly unlikely)
+     STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\1" PROJ_VERSION_MAJOR "${PJ_VERSION}")
+     STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\2" PROJ_VERSION_MINOR "${PJ_VERSION}")
+     STRING(REGEX REPLACE "([0-9])([0-9])([0-9])" "\\3" PROJ_VERSION_PATCH "${PJ_VERSION}")
+     STRING(CONCAT PROJ_VERSION_STR "(" ${PROJ_VERSION_MAJOR} "." ${PROJ_VERSION_MINOR} "." ${PROJ_VERSION_PATCH} ")")
 
-      # Minimum Proj version required is 4.9.3
-      IF ((PROJ_VERSION_MAJOR EQUAL 4) AND ((PROJ_VERSION_MINOR LESS 9) OR ((PROJ_VERSION_MINOR EQUAL 9) AND (PROJ_VERSION_PATCH LESS 3))))
-        MESSAGE(FATAL_ERROR "Found Proj: ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH}. Cannot build QGIS using Proj older than 4.9.3.")
-      ENDIF((PROJ_VERSION_MAJOR EQUAL 4) AND ((PROJ_VERSION_MINOR LESS 9) OR ((PROJ_VERSION_MINOR EQUAL 9) AND (PROJ_VERSION_PATCH LESS 3))))
+     # Minimum Proj version required is 4.9.3
+     IF ((PROJ_VERSION_MAJOR EQUAL 4) AND ((PROJ_VERSION_MINOR LESS 9) OR ((PROJ_VERSION_MINOR EQUAL 9) AND (PROJ_VERSION_PATCH LESS 3))))
+       MESSAGE(FATAL_ERROR "Found Proj: ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH}. Cannot build QGIS using Proj older than 4.9.3.")
+     ENDIF((PROJ_VERSION_MAJOR EQUAL 4) AND ((PROJ_VERSION_MINOR LESS 9) OR ((PROJ_VERSION_MINOR EQUAL 9) AND (PROJ_VERSION_PATCH LESS 3))))
    ENDIF(EXISTS ${PROJ_INCLUDE_DIR}/proj.h)
    IF (NOT PROJ_FIND_QUIETLY)
      MESSAGE(STATUS "Found Proj: ${PROJ_LIBRARY} version ${PROJ_VERSION_MAJOR} ${PROJ_VERSION_STR}")

diff --git a/doc/INSTALL.html b/doc/INSTALL.html
@@ -77,13 +77,13 @@
 <DIV CLASS="header" ID="header">
 <H1>QGIS</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Friday June 21, 2019</H3>
+<H3>Sunday August 04, 2019</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Friday June 21, 2019
-Last Change : Friday June 21, 2019
+Last Updated: Sunday August 04, 2019
+Last Change : Sunday August 04, 2019
 </P>
 <DIV CLASS="toc">
 
@@ -836,7 +836,7 @@ <H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
   Edit the properties of the project ALL_BUILD:
   Debugging -&gt; Command -&gt; D:\OSGeo4W64\QGIS\ms-windows\osgeo4w\build-qgis-test-x86_64\output\bin\RelWithDebInfo\qgis.exe
   Run.
-  Ignore the "These projects are out of date" message, it appeares even if no files were was changed.
+  Ignore the "These projects are out of date" message, it appears even if no files were changed.
 </P>
 <P>
 Old alternative method that might still work using cmake-gui: