fix PROJ_HAS_VERSION and also display version in cmake output (#6878)

3nids · web-flow · commit a34c44361d6a · 2018-04-27T09:16:53.000-04:00
diff --git 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
@@ -4222,7 +4222,7 @@ void QgisApp::about()
 
     versionString += QLatin1String( "</tr><tr>" );
 
-#if PJ_VERSION >= 500
+#if PROJ_HAS_INFO
     PJ_INFO info = proj_info();
     versionString += "<td>" + tr( "Compiled against PROJ" ) + "</td><td>" + QString::number( PJ_VERSION ) + "</td>";
     versionString += "<td>" + tr( "Running against PROJ" ) + "</td><td>" + info.version + "</td>";
