Skip to content
Permalink
Browse files

fix bionic build with pdal

  • Loading branch information
jef-n committed Nov 11, 2020
1 parent e5124d5 commit 5440021f4f6b149967f742174f0ff40fbfaef04d
Showing with 10 additions and 0 deletions.
  1. +2 −0 cmake_templates/qgsconfig.h.in
  2. +4 −0 src/app/qgisapp.cpp
  3. +4 −0 src/core/processing/qgsprocessingfeedback.cpp
@@ -80,6 +80,8 @@

#cmakedefine HAVE_PDAL
#define PDAL_VERSION "${PDAL_VERSION}"
#define PDAL_VERSION_MAJOR_INT ${PDAL_VERSION_MAJOR}
#define PDAL_VERSION_MINOR_INT ${PDAL_VERSION_MINOR}
#define PDAL_VERSION_MAJOR "${PDAL_VERSION_MAJOR}"
#define PDAL_VERSION_MINOR "${PDAL_VERSION_MINOR}"
#define PDAL_VERSION_MICRO "${PDAL_VERSION_MICRO}"
@@ -5321,7 +5321,11 @@ void QgisApp::about()

#ifdef HAVE_PDAL
versionString += QStringLiteral( "<td>%1</td><td>%2</td>" ).arg( tr( "Compiled against PDAL" ), PDAL_VERSION );
#if PDAL_VERSION_MAJOR_INT >= 2
versionString += QStringLiteral( "<td>%1</td><td>%2</td>" ).arg( tr( "Running against PDAL" ) ).arg( QString::fromStdString( pdal::Config::fullVersionString() ) );
#else
versionString += QStringLiteral( "<td>%1</td><td>%2</td>" ).arg( tr( "Running against PDAL" ) ).arg( QString::fromStdString( pdal::GetFullVersionString() ) );
#endif
versionString += QLatin1String( "</tr><tr>" );
#endif

@@ -104,7 +104,11 @@ void QgsProcessingFeedback::pushVersionInfo( const QgsProcessingProvider *provid
#endif

#ifdef HAVE_PDAL
#if PDAL_VERSION_MAJOR_INT >= 2
pushDebugInfo( tr( "PDAL version: %1" ).arg( QString::fromStdString( pdal::Config::fullVersionString() ) ) );
#else
pushDebugInfo( tr( "PDAL version: %1" ).arg( QString::fromStdString( pdal::GetFullVersionString() ) ) );
#endif
#endif

if ( provider && !provider->versionInfo().isEmpty() )

0 comments on commit 5440021

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