diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt index b5574be63eaef82ee8c4009be1a984a9ecca2f38..324361370a839f3feef3af385caa1d8a24d6831e 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 36717b6ebfdf7324d3e15deee77e2a9bfe6893c1..b8006df4d9143343f311c9011b077634beeafd4c 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 7026ea00a1dbd571abd4b7012659067c3034f933..2f8bbff1b6922fa40a7e5b073f680d272ba2317c 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 5dbafeb15d541b3ad1e798f0dbad28a0dbbab2ee..d761103799d0447de9e47d04e8f613405cc78d26 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 5ac25a184e4c931e5e1b39525f044d8ec45a1390..b11b5f1c4b5e38d84d37d7aa67dccc56a68cc7a4 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)