From 342e6db8285a127a2593ab9bf6c816c5503d4af7 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Fri, 21 Feb 2020 08:37:08 +0100 Subject: [PATCH] Fix FindProj.cmake (followup 38e57db0ed387e32) --- cmake/FindProj.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindProj.cmake b/cmake/FindProj.cmake index a080b72e53c..68a6c204c12 100644 --- a/cmake/FindProj.cmake +++ b/cmake/FindProj.cmake @@ -59,7 +59,7 @@ IF (PROJ_FOUND) STRING(CONCAT PROJ_VERSION_STR "(" ${PROJ_VERSION_MAJOR} "." ${PROJ_VERSION_MINOR} "." ${PROJ_VERSION_PATCH} ")") IF ((PROJ_VERSION_MAJOR EQUAL 6) AND ((PROJ_VERSION_MINOR LESS 3) OR (PROJ_VERSION_MINOR EQUAL 3 AND PROJ_VERSION_PATCH LESS 1))) MESSAGE (FATAL_ERROR "Cannot build QGIS using Proj ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH} Use 6.3.1 or higher.") - ENDIF ((PROJ_VERSION_MAJOR EQUAL 6) AND (PROJ_VERSION_MINOR LESS 3)) + ENDIF ((PROJ_VERSION_MAJOR EQUAL 6) AND ((PROJ_VERSION_MINOR LESS 3) OR (PROJ_VERSION_MINOR EQUAL 3 AND PROJ_VERSION_PATCH LESS 1))) ELSE(EXISTS ${PROJ_INCLUDE_DIR}/proj.h AND EXISTS ${PROJ_INCLUDE_DIR}/proj_experimental.h) FILE(READ ${PROJ_INCLUDE_DIR}/proj_api.h proj_version) STRING(REGEX REPLACE "^.*PJ_VERSION ([0-9]+).*$" "\\1" PJ_VERSION "${proj_version}")