Skip to content
Permalink
Browse files

Build/test fixes

  • Loading branch information
wonder-sk committed May 16, 2018
1 parent 3fc99c0 commit 94f56b61a8fbb932f728b52365ce76d499a41fab
@@ -106,10 +106,16 @@ as if the data is vector or scalar, etc.
%End
public:
QgsMeshDatasetMetadata();
%Docstring
Constructs an empty metadata object
%End
QgsMeshDatasetMetadata( bool isScalar,
bool isValid,
bool isOnVertices,
const QMap<QString, QString> &extraOptions );
%Docstring
Consutructs a valid metadata object
%End

QMap<QString, QString> extraOptions() const;
%Docstring
@@ -228,6 +228,7 @@
%Include auto_generated/raster/qgssinglebandgrayrenderer.sip
%Include auto_generated/raster/qgssinglebandpseudocolorrenderer.sip
%Include auto_generated/raster/qgshillshaderenderer.sip
%Include auto_generated/mesh/qgsmeshrenderersettings.sip
%Include auto_generated/scalebar/qgsdoubleboxscalebarrenderer.sip
%Include auto_generated/scalebar/qgsnumericscalebarrenderer.sip
%Include auto_generated/scalebar/qgsscalebarsettings.sip
@@ -381,7 +382,6 @@
%Include auto_generated/raster/qgsrasterprojector.sip
%Include auto_generated/mesh/qgsmeshdataprovider.sip
%Include auto_generated/mesh/qgsmeshlayer.sip
%Include auto_generated/mesh/qgsmeshrenderersettings.sip
%Include auto_generated/geometry/qgsabstractgeometry.sip
%Include auto_generated/geometry/qgsgeometry.sip
%Include auto_generated/geometry/qgspoint.sip
@@ -102,7 +102,9 @@ class CORE_EXPORT QgsMeshDatasetValue
class CORE_EXPORT QgsMeshDatasetMetadata
{
public:
//! Constructs an empty metadata object
QgsMeshDatasetMetadata() = default;
//! Consutructs a valid metadata object
QgsMeshDatasetMetadata( bool isScalar,
bool isValid,
bool isOnVertices,
@@ -25,6 +25,8 @@ IF (WITH_INTERNAL_MDAL)
${CMAKE_SOURCE_DIR}/external/mdal/mdal_utils.cpp
${CMAKE_SOURCE_DIR}/external/mdal/mdal_loader.cpp
${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_2dm.cpp
${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_ascii_dat.cpp
${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_binary_dat.cpp
)

SET(MDAL_LIB_HDRS
@@ -33,6 +35,8 @@ IF (WITH_INTERNAL_MDAL)
${CMAKE_SOURCE_DIR}/external/mdal/mdal_loader.hpp
${CMAKE_SOURCE_DIR}/external/mdal/mdal_defines.hpp
${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_2dm.hpp
${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_ascii_dat.hpp
${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_binary_dat.hpp
)

UNSET(MDAL_LIBRARY)

0 comments on commit 94f56b6

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