Skip to content

Commit 35e49ed

Browse files
committed
Bump required GDAL version from 2.0 to 2.1
Because we need GDALTranslate()
1 parent 73fdb25 commit 35e49ed

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Required build dependencies:
102102
- Sqlite3 >= 3.0.0
103103
- SpatiaLite
104104
- libspatialindex
105-
- GDAL/OGR >= 2.0
105+
- GDAL/OGR >= 2.1
106106
- Qwt >= 5.0 & (< 6.1 with internal QwtPolar)
107107
- expat >= 1.95
108108
- QScintilla2

cmake/FindGDAL.cmake

+8-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,11 @@ ELSE(WIN32)
6262
STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" GDAL_VERSION_MAJOR "${GDAL_VERSION}")
6363
STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" GDAL_VERSION_MINOR "${GDAL_VERSION}")
6464
IF (GDAL_VERSION_MAJOR LESS 2)
65-
MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION}). Use 2.0 or higher.")
65+
MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION}). Use 2.1 or higher.")
6666
ENDIF (GDAL_VERSION_MAJOR LESS 2)
67+
IF ( (GDAL_VERSION_MAJOR EQUAL 2) AND (GDAL_VERSION_MINOR LESS 1) )
68+
MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION}). Use 2.1 or higher.")
69+
ENDIF( (GDAL_VERSION_MAJOR EQUAL 2) AND (GDAL_VERSION_MINOR LESS 1) )
6770

6871
ENDIF (GDAL_LIBRARY)
6972
SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
@@ -103,8 +106,11 @@ ELSE(WIN32)
103106
# version 1.2.5 is known NOT to be supported (missing CPL_STDCALL macro)
104107
# According to INSTALL, 2.0+ is required
105108
IF (GDAL_VERSION_MAJOR LESS 2)
106-
MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION}). Use 2.0 or higher.")
109+
MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION}). Use 2.1 or higher.")
107110
ENDIF (GDAL_VERSION_MAJOR LESS 2)
111+
IF ( (GDAL_VERSION_MAJOR EQUAL 2) AND (GDAL_VERSION_MINOR LESS 1) )
112+
MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION}). Use 2.1 or higher.")
113+
ENDIF( (GDAL_VERSION_MAJOR EQUAL 2) AND (GDAL_VERSION_MINOR LESS 1) )
108114

109115
# set INCLUDE_DIR to prefix+include
110116
EXEC_PROGRAM(${GDAL_CONFIG}

0 commit comments

Comments
 (0)