Skip to content
Permalink
Browse files

fix building with proj6

  • Loading branch information
PeterPetrik committed Apr 18, 2019
1 parent 84ec951 commit 6c9df8b6e2ed1c35dc1574299107a3fb2d3b609d
Showing with 4 additions and 10 deletions.
  1. +4 −10 src/core/processing/qgsprocessingfeedback.cpp
@@ -19,11 +19,11 @@
#include "qgsgeos.h"
#include <ogr_api.h>
#include <gdal_version.h>
#if PROJ_VERSION_MAJOR > 4
#include <proj.h>
#else
#include <proj_api.h>

#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
#endif
#include <proj_api.h>

void QgsProcessingFeedback::setProgressText( const QString & )
{
@@ -64,13 +64,7 @@ void QgsProcessingFeedback::pushVersionInfo()
pushDebugInfo( tr( "Qt version: %1" ).arg( qVersion() ) );
pushDebugInfo( tr( "GDAL version: %1" ).arg( GDALVersionInfo( "RELEASE_NAME" ) ) );
pushDebugInfo( tr( "GEOS version: %1" ).arg( GEOSversion() ) );

#if PROJ_VERSION_MAJOR > 4
PJ_INFO info = proj_info();
pushDebugInfo( tr( "PROJ version: %1" ).arg( info.release ) );
#else
pushDebugInfo( tr( "PROJ version: %1" ).arg( PJ_VERSION ) );
#endif
}


0 comments on commit 6c9df8b

Please sign in to comment.
You can’t perform that action at this time.