fix builds

qgis · Oct 26, 2020 · 8c256c5 · 8c256c5
1 parent 29113a8
commit 8c256c5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/src/app/qgslayerstylingwidget.cpp b/src/app/qgslayerstylingwidget.cpp
@@ -679,8 +679,8 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
         QgsPointCloudLayer *pcLayer = qobject_cast<QgsPointCloudLayer *>( mCurrentLayer );
         ( void )pcLayer;
 
-          //TODO
-          mStackedWidget->setCurrentIndex( mNotSupportedPage );
+        //TODO
+        mStackedWidget->setCurrentIndex( mNotSupportedPage );
         break;
       }
 

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1620,10 +1620,20 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${Qt5SerialPort_INCLUDE_DIRS}
   ${Protobuf_INCLUDE_DIRS}
   ${ZLIB_INCLUDE_DIRS}
-  ${ZSTD_INCLUDE_DIR}
   ${LazPerf_INCLUDE_DIR}
 )
 
+IF (HAVE_ZSTD)
+  INCLUDE_DIRECTORIES(SYSTEM
+    ${ZSTD_INCLUDE_DIR}
+  )
+ENDIF (HAVE_ZSTD)
+
+IF (HAVE_LazPerf)
+  INCLUDE_DIRECTORIES(SYSTEM
+    ${LazPerf_INCLUDE_DIR}
+  )
+ENDIF (HAVE_LazPerf)
 
 IF (HAVE_OPENCL)
     SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
@@ -1763,6 +1773,12 @@ TARGET_LINK_LIBRARIES(qgis_core
   ${ZLIB_LIBRARIES}
 )
 
+IF (HAVE_ZSTD)
+  TARGET_LINK_LIBRARIES(qgis_core
+    ${ZSTD_LIBRARY}
+  )
+ENDIF (HAVE_ZSTD)
+
 IF (FORCE_STATIC_PROVIDERS)
   INCLUDE_DIRECTORIES(
     ${CMAKE_SOURCE_DIR}/src/providers/wms

diff --git a/src/core/pointcloud/qgspointcloudindex.h b/src/core/pointcloud/qgspointcloudindex.h
@@ -115,6 +115,7 @@ class CORE_EXPORT QgsPointCloudDataBounds
     qint32 mXMin, mYMin, mZMin, mXMax, mYMax, mZMax;
 };
 
+
 /**
  * \ingroup core
  *
@@ -191,7 +192,7 @@ class CORE_EXPORT QgsPointCloudIndex: public QObject
     QgsRectangle mExtent;  //!< 2D extent of data
     double mZMin = 0, mZMax = 0;   //!< Vertical extent of data
 
-    QHash<IndexedPointCloudNode, int> mHierarchy; //!< data hierarchy
+    QHash<IndexedPointCloudNode, int> mHierarchy; //!< Data hierarchy
     QgsVector3D mScale; //!< Scale of our int32 coordinates compared to CRS coords
     QgsVector3D mOffset; //!< Offset of our int32 coordinates compared to CRS coords
     QgsPointCloudDataBounds mRootBounds;  //!< Bounds of the root node's cube (in int32 coordinates)

diff --git a/src/core/pointcloud/qgspointcloudrenderer.h b/src/core/pointcloud/qgspointcloudrenderer.h
@@ -45,7 +45,7 @@ class CORE_EXPORT QgsPointCloudRendererConfig
     QgsPointCloudRendererConfig();
     //! Copy constructor
     QgsPointCloudRendererConfig( const QgsPointCloudRendererConfig &other );
-    //! Assigment contructor
+    //! Assignment constructor
     QgsPointCloudRendererConfig &operator= ( const QgsPointCloudRendererConfig &other );
 
     //! Returns z min
@@ -59,7 +59,7 @@ class CORE_EXPORT QgsPointCloudRendererConfig
     //! Sets z max
     void setZMax( double value );
 
-    //! Retuns pen width
+    //! Returns pen width
     int penWidth() const;
 
     //! Sets pen width