diff --git a/cmake/FindProj.cmake b/cmake/FindProj.cmake index 1401d6b0aef..68871582452 100644 --- a/cmake/FindProj.cmake +++ b/cmake/FindProj.cmake @@ -57,7 +57,14 @@ IF (PROJ_FOUND) check_library_exists("${PROJ_LIBRARY}" proj_info "" PROJ_HAS_INFO) IF (NOT PROJ_FIND_QUIETLY) - MESSAGE(STATUS "Found Proj: ${PROJ_LIBRARY}") + IF (PROJ_HAS_INFO) + FILE(READ ${PROJ_INCLUDE_DIR}/proj.h proj_version) + STRING(REGEX REPLACE "^.*PROJ_VERSION_MAJOR +([0-9]+).*$" "\\1" PROJ_VERSION_MAJOR "${proj_version}") + 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} ")") + ENDIF (PROJ_HAS_INFO) + MESSAGE(STATUS "Found Proj: ${PROJ_LIBRARY} ${PROJ_VERSION_STR}") ENDIF (NOT PROJ_FIND_QUIETLY) ELSE (PROJ_FOUND) diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index cc45231e7d8..1ecfac76ab9 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -4222,7 +4222,7 @@ void QgisApp::about() versionString += QLatin1String( "" ); -#if PJ_VERSION >= 500 +#if PROJ_HAS_INFO PJ_INFO info = proj_info(); versionString += "" + tr( "Compiled against PROJ" ) + "" + QString::number( PJ_VERSION ) + ""; versionString += "" + tr( "Running against PROJ" ) + "" + info.version + "";