From e4c761d0c4cf77f4b1ab58fbecc73f7a56a922f9 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Tue, 2 Jan 2018 13:40:12 -0500 Subject: [PATCH] Compilation fixes Former-commit-id: 3848cc6529c4caa6d1f71ed9f1b31ede37990d3a --- SuperBuild/cmake/External-VTK7.cmake | 1 - modules/odm_25dmeshing/CMakeLists.txt | 1 + modules/odm_25dmeshing/src/Odm25dMeshing.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SuperBuild/cmake/External-VTK7.cmake b/SuperBuild/cmake/External-VTK7.cmake index 246fa630..02a00efd 100644 --- a/SuperBuild/cmake/External-VTK7.cmake +++ b/SuperBuild/cmake/External-VTK7.cmake @@ -16,7 +16,6 @@ ExternalProject_Add(${_proj_name} -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR} -DVTK_SMP_IMPLEMENTATION_TYPE=TBB -DCMAKE_BUILD_TYPE=Release - -DBUILD_SHARED_LIBS=OFF -DVTK_Group_Rendering=OFF -DBUILD_TESTING=OFF #--Build step----------------- diff --git a/modules/odm_25dmeshing/CMakeLists.txt b/modules/odm_25dmeshing/CMakeLists.txt index 905ca054..708555e9 100644 --- a/modules/odm_25dmeshing/CMakeLists.txt +++ b/modules/odm_25dmeshing/CMakeLists.txt @@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) +set (CMAKE_CXX_STANDARD 11) #set(VTK_DIR "/data/packages/VTK-7.1.1-build") set(VTK_SMP_IMPLEMENTATION_TYPE TBB) find_package(VTK 7.1.1 REQUIRED) diff --git a/modules/odm_25dmeshing/src/Odm25dMeshing.cpp b/modules/odm_25dmeshing/src/Odm25dMeshing.cpp index 07098e8a..ba8ecd91 100644 --- a/modules/odm_25dmeshing/src/Odm25dMeshing.cpp +++ b/modules/odm_25dmeshing/src/Odm25dMeshing.cpp @@ -165,7 +165,7 @@ void Odm25dMeshing::buildMesh(){ log << "DSM size is " << width << "x" << height << " (" << ceil(width * height * sizeof(float) * 1e-6) << " MB) \n"; image->AllocateScalars(VTK_FLOAT, 1); - log << "Point interpolation using shepard's kernel..."; + log << "Point interpolation using shepard's kernel... "; vtkSmartPointer interpolator = vtkSmartPointer::New();