Remove duplicate proj version checks, support for very old proj versions

qgis · Jan 29, 2025 · a941023 · a941023
1 parent 2963202
commit a941023
Showing 1 changed file with 3 additions and 27 deletions.
diff --git a/cmake/FindProj.cmake b/cmake/FindProj.cmake
@@ -30,7 +30,6 @@ if(NOT PROJ_FOUND)
         OR NOT CMAKE_FIND_FRAMEWORK)
       SET (CMAKE_FIND_FRAMEWORK_save ${CMAKE_FIND_FRAMEWORK} CACHE STRING "" FORCE)
       SET (CMAKE_FIND_FRAMEWORK "ONLY" CACHE STRING "" FORCE)
-      #FIND_PATH(PROJ_INCLUDE_DIR PROJ/proj_api.h)
       FIND_LIBRARY(PROJ_LIBRARY PROJ)
       IF (PROJ_LIBRARY)
         # FIND_PATH doesn't add "Headers" for a framework
@@ -39,17 +38,11 @@ if(NOT PROJ_FOUND)
       SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
     ENDIF ()
   ENDIF (APPLE)
-  
-  FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
+
+  FIND_PATH(PROJ_INCLUDE_DIR proj.h
     "$ENV{INCLUDE}"
     "$ENV{LIB_DIR}/include"
-    )
-  IF (NOT PROJ_INCLUDE_DIR)
-    FIND_PATH(PROJ_INCLUDE_DIR proj.h
-      "$ENV{INCLUDE}"
-      "$ENV{LIB_DIR}/include"
-      )
-  ENDIF (NOT PROJ_INCLUDE_DIR)
+  )
 
   FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS
     "$ENV{LIB}"
@@ -67,23 +60,6 @@ if(NOT PROJ_FOUND)
        STRING(REGEX REPLACE "^.*PROJ_VERSION_MINOR +([0-9]+).*$" "\\1" PROJ_VERSION_MINOR "${proj_version}")
        STRING(REGEX REPLACE "^.*PROJ_VERSION_PATCH +([0-9]+).*$" "\\1" PROJ_VERSION_PATCH "${proj_version}")
        STRING(CONCAT PROJ_VERSION_STR "(" ${PROJ_VERSION_MAJOR} "." ${PROJ_VERSION_MINOR} "." ${PROJ_VERSION_PATCH} ")")
-       IF ((PROJ_VERSION_MAJOR EQUAL 7) AND ((PROJ_VERSION_MINOR LESS 2) OR (PROJ_VERSION_MAJOR LESS 7)))
-         MESSAGE (FATAL_ERROR "Cannot build QGIS using Proj ${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH} Use 7.2.0 or higher.")
-       ENDIF ((PROJ_VERSION_MAJOR EQUAL 7) AND ((PROJ_VERSION_MINOR LESS 2) OR (PROJ_VERSION_MAJOR LESS 7)))
-     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}")
-
-       # 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))))
      ENDIF(EXISTS ${PROJ_INCLUDE_DIR}/proj.h AND EXISTS ${PROJ_INCLUDE_DIR}/proj_experimental.h)
      IF (NOT PROJ_FIND_QUIETLY)
        MESSAGE(STATUS "Found Proj: ${PROJ_LIBRARY} version ${PROJ_VERSION_MAJOR} ${PROJ_VERSION_STR}")