From 5399b5b5707a198e5b180904e2ee4751f2e31a1f Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 3 Apr 2019 14:09:21 +0200
Subject: [PATCH] [CMake] Removed hack for unresolved external in
vtkGUISupportQt.
---
Applications/DataExplorer/DataExplorer.cmake | 2 --
Applications/DataExplorer/VtkVis/CMakeLists.txt | 4 ----
scripts/cmake/ConanSetup.cmake | 4 +---
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 680d316c696..febcc41ab65 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -60,8 +60,6 @@ if(OGS_USE_NETCDF)
endif()
if(NOT APPLE AND OGS_USE_CONAN)
- # HACK for unresolved external
- target_link_libraries(DataExplorer vtkGUISupportQt-8.1)
if(UNIX)
target_link_libraries(DataExplorer Qt5::X11Extras)
endif()
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index f873f6c550e..839a590fe0f 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -146,10 +146,6 @@ if (OGS_USE_NETCDF)
target_link_libraries(VtkVis PRIVATE NetCdfDialogLib)
endif()
-if(NOT APPLE AND OGS_USE_CONAN)
- # HACK for unresolved external
- target_link_libraries(VtkVis PUBLIC vtkGUISupportQt-8.1)
-endif()
set_property(TARGET VtkVis PROPERTY FOLDER "DataExplorer")
add_autogen_include(VtkVis)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index c92fa491921..9e476c4ded9 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -70,9 +70,7 @@ if(OGS_BUILD_GUI)
set(CONAN_OPTIONS ${CONAN_OPTIONS}
vtk:minimal=False
vtk:qt=True
- qt:with_sqlite3=False
- qt:with_mysql=False
- qt:with_odbc=False
+ qt:qtxmlpatterns=True
)
endif()
--
GitLab