Skip to content
Snippets Groups Projects
Commit 35a1e5ed authored by Lars Bilke's avatar Lars Bilke Committed by Dmitri Naumov
Browse files

[CMake] Builds on macOS.

parent 99c38d1a
No related branches found
No related tags found
No related merge requests found
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")
......@@ -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;
......
......@@ -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")
......
......@@ -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>
......
......@@ -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()
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment