Skip to content
Snippets Groups Projects
Commit aa86e83b authored by Lars Bilke's avatar Lars Bilke
Browse files

Data Explorer builds with Boost and VTK from conan.

parent 64e5024c
No related branches found
No related tags found
No related merge requests found
if(QT4_FOUND)
set(VTK_QT_VERSION 4 CACHE INTERNAL "")
else()
set(VTK_QT_VERSION 5 CACHE INTERNAL "")
endif()
add_subdirectory(VtkModules/Qt)
if(VTKFBXCONVERTER_FOUND)
add_definitions(-DVTKFBXCONVERTER_FOUND)
include_directories(${VTKFBXCONVERTER_INCLUDE_DIRS})
......
......@@ -28,6 +28,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/DataView/DiagramView
${CMAKE_CURRENT_SOURCE_DIR}/VtkVis
${CMAKE_CURRENT_SOURCE_DIR}/VtkAct
${CMAKE_CURRENT_SOURCE_DIR}/VtkModules/Qt
)
# Put moc files in a project folder
......@@ -61,6 +62,7 @@ target_link_libraries(DataExplorer
VtkAct
Threads::Threads
OGSFileConverterLib
vtkGUISupportQt
)
if(CMAKE_CROSSCOMPILING)
......
......@@ -107,6 +107,7 @@ include_directories(
${GUI_SOURCE_DIR_REL}/VtkAct
${GUI_SOURCE_DIR_REL}/Base
${GUI_SOURCE_DIR_REL}/DataView
${GUI_SOURCE_DIR_REL}/VtkModules/Qt
${CMAKE_CURRENT_BINARY_DIR}/../../BaseLib
${CMAKE_CURRENT_BINARY_DIR}/../DataView
......
......@@ -34,6 +34,8 @@ else()
message(FATAL_ERROR "External dependencies not setup. Run conan install!")
endif()
conan_basic_setup()
include(${CONAN_VTK_ROOT}/lib/cmake/vtk-7.0/VTKConfig.cmake)
include(${VTK_USE_FILE})
include(scripts/cmake/CheckTypeSizes.cmake)
include(scripts/cmake/Functions.cmake)
......
......@@ -53,7 +53,6 @@ if(OGS_BUILD_GUI)
QtDataView
QtStratView
VtkVis
vtkInteractionStyle
)
endif()
......
Subproject commit 45b9fba1760f8780c11473541f3efd95cb5284cc
Subproject commit 0a0bd8362f861b6e141936b990133c6616522a82
[requires]
Boost/1.60.0@lasote/stable
Shapelib/1.3.0@bilke/stable
VTK/7.0.0@bilke/stable
[generators]
cmake
[options]
Boost:shared=False
Boost:header_only=True
return()
include(ThirdPartyLibVersions)
include(ExternalProject)
......
return()
include(ThirdPartyLibVersions)
include(ExternalProject)
......
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