Skip to content

Commit 260d76b

Browse files
committed
fix cmake warning and report GDAL version
1 parent f48a4bf commit 260d76b

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

cmake/FindGDAL.cmake

+6-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ ELSE(WIN32)
6161
STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" GDAL_VERSION_MINOR "${GDAL_VERSION}")
6262
IF (GDAL_VERSION_MAJOR LESS 1 OR (GDAL_VERSION EQUAL 1 AND GDAL_VERSION_MINOR LESS 4))
6363
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))
6565
ENDIF (GDAL_LIBRARY)
6666
SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
6767
ENDIF ()
@@ -97,7 +97,7 @@ ELSE(WIN32)
9797
# According to INSTALL, 1.4.0+ is required
9898
IF (GDAL_VERSION_MAJOR LESS 1 OR (GDAL_VERSION_MAJOR EQUAL 1 AND GDAL_VERSION_MINOR LESS 4))
9999
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))
101101

102102
# set INCLUDE_DIR to prefix+include
103103
EXEC_PROGRAM(${GDAL_CONFIG}
@@ -172,7 +172,10 @@ ENDIF (GDAL_INCLUDE_DIR AND GDAL_LIBRARY)
172172
IF (GDAL_FOUND)
173173

174174
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})")
176179
ENDIF (NOT GDAL_FIND_QUIETLY)
177180

178181
ELSE (GDAL_FOUND)

0 commit comments

Comments
 (0)