fix bionic build with pdal

qgis · Nov 11, 2020 · 5440021 · 5440021
1 parent e5124d5
commit 5440021
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -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}"

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -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
 

diff --git a/src/core/processing/qgsprocessingfeedback.cpp b/src/core/processing/qgsprocessingfeedback.cpp
@@ -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() )