From 35a1e5ed2108b538ca56d9b9eb4f4f09ea735891 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 27 Jun 2018 09:41:50 +0200
Subject: [PATCH] [CMake] Builds on macOS.
---
Applications/DataExplorer/NetCdfDialog/CMakeLists.txt | 2 +-
.../DataExplorer/NetCdfDialog/NetCdfConfigureDialog.cpp | 2 +-
Applications/DataExplorer/VtkVis/CMakeLists.txt | 2 +-
Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui | 6 +++---
scripts/cmake/ConanSetup.cmake | 6 +++---
scripts/cmake/Find.cmake | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt b/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt
index df517339576..baaa7112efa 100644
--- a/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt
+++ b/Applications/DataExplorer/NetCdfDialog/CMakeLists.txt
@@ -1,3 +1,3 @@
add_library(NetCdfDialogLib NetCdfConfigureDialog.cpp NetCdfConfigureDialog.h)
-target_link_libraries(NetCdfDialogLib PUBLIC Qt5::Widgets PRIVATE MathLib)
+target_link_libraries(NetCdfDialogLib PUBLIC Qt5::Widgets PRIVATE MathLib vtknetcdfcpp)
set_property(TARGET NetCdfDialogLib PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.cpp b/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.cpp
index 338d737b7dd..31edbeb32ad 100644
--- a/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.cpp
+++ b/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.cpp
@@ -306,7 +306,7 @@ double NetCdfConfigureDialog::getResolution()
void NetCdfConfigureDialog::createDataObject()
{
- auto* length = new long[_currentVar->num_dims()];
+ auto* length = new std::size_t[_currentVar->num_dims()];
double originLon = 0, originLat = 0;
double lastLon = 0, lastLat = 0;
unsigned sizeLon = 0, sizeLat = 0;
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index 69dee55ba5f..19835cc8f7a 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -135,7 +135,7 @@ if(GEOTIFF_FOUND)
endif() # GEOTIFF_FOUND
target_link_libraries(VtkVis
- PUBLIC BaseLib GeoLib MeshLib DataHolderLib QtBase
+ PUBLIC BaseLib GeoLib MeshLib DataHolderLib QtBase vtkIOImage
PRIVATE MathLib ApplicationsFileIO Qt5::Gui logog
)
set_property(TARGET VtkVis PROPERTY FOLDER "DataExplorer")
diff --git a/Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui b/Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui
index 4b3c4df1105..80476d5e960 100644
--- a/Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui
+++ b/Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui
@@ -535,7 +535,7 @@
</layout>
</item>
<item>
- <widget class="QVTKWidget2" name="vtkWidget" native="true">
+ <widget class="QVTKWidget" name="vtkWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -548,9 +548,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>QVTKWidget2</class>
+ <class>QVTKWidget</class>
<extends>QWidget</extends>
- <header>QVTKWidget2.h</header>
+ <header>QVTKWidget.h</header>
</customwidget>
</customwidgets>
<resources>
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 11b32b59f8f..5ffdf44999f 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -18,13 +18,13 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake)
set(CONAN_REQUIRES
Boost/1.64.0@conan/stable
Eigen3/3.2.9@bilke/stable
- VTK/8.1.0@bilke/testing
+ VTK/8.1.0@bilke/stable
CACHE INTERNAL ""
)
set(CONAN_OPTIONS
Boost:header_only=True
- Qt:xmlpatterns=True
+ Qt:qtxmlpatterns=True
CACHE INTERNAL ""
)
@@ -48,7 +48,7 @@ if(OGS_BUILD_GUI)
set(CONAN_REQUIRES ${CONAN_REQUIRES}
Shapelib/1.3.0@bilke/stable
libgeotiff/1.4.2@bilke/stable
- Qt/5.11@bincrafters/stable
+ Qt/5.11.0@bilke/stable
)
set(CONAN_OPTIONS ${CONAN_OPTIONS} VTK:qt=True)
endif()
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 7e9df447664..f0aa58133ca 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -66,7 +66,7 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
include(VtkModules)
#find_package(VTK COMPONENTS ${VTK_MODULES} REQUIRED)
-find_package(VTK 8.0.0 REQUIRED)
+find_package(VTK 8.1.0 REQUIRED)
include(${VTK_USE_FILE})
find_package(Eigen3 3.2.9 REQUIRED)
--
GitLab