@@ -61,7 +61,7 @@ ELSE(WIN32)
61
61
STRING (REGEX REPLACE "([0-9]+)\\ .([0-9]+)\\ .([0-9]+)" "\\ 2" GDAL_VERSION_MINOR "${GDAL_VERSION} " )
62
62
IF (GDAL_VERSION_MAJOR LESS 1 OR (GDAL_VERSION EQUAL 1 AND GDAL_VERSION_MINOR LESS 4))
63
63
MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION} ). Use 1.4.0 or higher." )
64
- ENDIF (GDAL_VERSION_MAJOR LESS 1 OR GDAL_VERSION_MINOR LESS 4)
64
+ ENDIF (GDAL_VERSION_MAJOR LESS 1 OR (GDAL_VERSION EQUAL 1 AND GDAL_VERSION_MINOR LESS 4) )
65
65
ENDIF (GDAL_LIBRARY)
66
66
SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
67
67
ENDIF ()
@@ -97,7 +97,7 @@ ELSE(WIN32)
97
97
# According to INSTALL, 1.4.0+ is required
98
98
IF (GDAL_VERSION_MAJOR LESS 1 OR (GDAL_VERSION_MAJOR EQUAL 1 AND GDAL_VERSION_MINOR LESS 4))
99
99
MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION} ). Use 1.4.0 or higher." )
100
- ENDIF (GDAL_VERSION_MAJOR LESS 1 OR GDAL_VERSION_MINOR LESS 4)
100
+ ENDIF (GDAL_VERSION_MAJOR LESS 1 OR (GDAL_VERSION_MAJOR EQUAL 1 AND GDAL_VERSION_MINOR LESS 4) )
101
101
102
102
# set INCLUDE_DIR to prefix+include
103
103
EXEC_PROGRAM (${GDAL_CONFIG}
@@ -172,7 +172,10 @@ ENDIF (GDAL_INCLUDE_DIR AND GDAL_LIBRARY)
172
172
IF (GDAL_FOUND)
173
173
174
174
IF (NOT GDAL_FIND_QUIETLY)
175
- MESSAGE (STATUS "Found GDAL: ${GDAL_LIBRARY} " )
175
+ FILE (READ ${GDAL_INCLUDE_DIR} /gdal_version.h gdal_version)
176
+ STRING (REGEX REPLACE "^.*GDAL_RELEASE_NAME +\" ([^\" ]+)\" .*$" "\\ 1" GDAL_RELEASE_NAME "${gdal_version} " )
177
+
178
+ MESSAGE (STATUS "Found GDAL: ${GDAL_LIBRARY} (${GDAL_RELEASE_NAME} )" )
176
179
ENDIF (NOT GDAL_FIND_QUIETLY)
177
180
178
181
ELSE (GDAL_FOUND)
0 commit comments