From 20a5d874a4bd853f99a9042a4b0e727781fc897b Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 6 Oct 2021 17:51:05 +0200
Subject: [PATCH] [cmake] Added target includes for gui.
---
Applications/DataExplorer/DataView/CMakeLists.txt | 4 +++-
.../DataExplorer/DataView/DiagramView/CMakeLists.txt | 5 ++++-
Applications/DataExplorer/DataView/StratView/CMakeLists.txt | 5 ++++-
Applications/DataExplorer/VtkVis/CMakeLists.txt | 4 +++-
scripts/cmake/Dependencies.cmake | 3 +++
5 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index b5574be63ea..324361370a8 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -123,7 +123,9 @@ set(CMAKE_AUTOUIC NO)
qt5_wrap_ui(genUiHeaders ${UIS})
ogs_add_library(QtDataView ${SOURCES} ${HEADERS} ${UIS} ${genUiHeaders})
-target_include_directories(QtDataView PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(
+ QtDataView PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+)
target_link_libraries(
QtDataView
PUBLIC GeoLib MeshGeoToolsLib MeshLib QtBase VtkVis
diff --git a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index 36717b6ebfd..b8006df4d91 100644
--- a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -27,7 +27,10 @@ set(CMAKE_AUTOUIC NO)
qt5_wrap_ui(genUiHeaders ${UIS})
ogs_add_library(QtDiagramView ${SOURCES} ${HEADERS} ${UIS} ${genUiHeaders})
-target_include_directories(QtDiagramView PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(
+ QtDiagramView PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
+ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+)
target_link_libraries(
QtDiagramView PRIVATE BaseLib GeoLib QtBase DataHolderLib Qt5::Gui
)
diff --git a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index 7026ea00a1d..2f8bbff1b69 100644
--- a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -10,7 +10,10 @@ set(CMAKE_AUTOUIC NO)
qt5_wrap_ui(genUiHeaders ${UIS})
ogs_add_library(QtStratView ${SOURCES} ${HEADERS} ${UIS})
-target_include_directories(QtStratView PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(
+ QtStratView PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
+ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+)
target_link_libraries(
QtStratView PRIVATE BaseLib GeoLib DataHolderLib QtBase Qt5::Gui
)
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index 5dbafeb15d5..d761103799d 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -36,7 +36,9 @@ if(OGS_USE_NETCDF)
endif()
ogs_add_library(VtkVisFilter ${FILTER_SOURCES})
-target_include_directories(VtkVisFilter PUBLIC ${VTK_INCLUDE_DIRS})
+target_include_directories(
+ VtkVisFilter PUBLIC ${VTK_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}
+)
target_link_libraries(VtkVisFilter PRIVATE GeoLib Qt5::Core Qt5::Widgets)
if(OGS_USE_NETCDF)
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index 5ac25a184e4..b11b5f1c4b5 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -427,6 +427,9 @@ else()
)
include(${VTK_BINARY_DIR}/VTKConfig.cmake)
endif()
+if(VTK_ADDED AND OPENMP_FOUND AND TARGET vtkFiltersStatistics)
+ target_link_libraries(vtkFiltersStatistics PRIVATE OpenMP::OpenMP_C)
+endif()
# end VTK ###
if(OGS_BUILD_TESTING)
--
GitLab