From 358622a38114a39fdf342f29cf3d137b6e1ba354 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 15 Feb 2018 15:12:59 +0100
Subject: [PATCH] Removed submodule vtkGUISupport and switched to QVTKWidget2.
---
.gitmodules | 3 ---
.../VtkVis/VisualizationWidgetBase.ui | 6 +++---
ThirdParty/CMakeLists.txt | 16 ++++++++--------
ThirdParty/vtkGUISupportQt | 1 -
scripts/cmake/SubmoduleSetup.cmake | 2 +-
5 files changed, 12 insertions(+), 16 deletions(-)
delete mode 160000 ThirdParty/vtkGUISupportQt
diff --git a/.gitmodules b/.gitmodules
index 7b666184bc5..c51df9e2766 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,6 @@
[submodule "ThirdParty/autocheck"]
path = ThirdParty/autocheck
url = https://github.com/thejohnfreeman/autocheck.git
-[submodule "ThirdParty/vtkGUISupportQt"]
- path = ThirdParty/vtkGUISupportQt
- url = https://github.com/ufz/vtkGUISupportQt.git
[submodule "ThirdParty/metis"]
path = ThirdParty/metis
url = https://github.com/scibuilder/metis.git
diff --git a/Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui b/Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui
index 80476d5e960..4b3c4df1105 100644
--- a/Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui
+++ b/Applications/DataExplorer/VtkVis/VisualizationWidgetBase.ui
@@ -535,7 +535,7 @@
</layout>
</item>
<item>
- <widget class="QVTKWidget" name="vtkWidget" native="true">
+ <widget class="QVTKWidget2" name="vtkWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -548,9 +548,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>QVTKWidget</class>
+ <class>QVTKWidget2</class>
<extends>QWidget</extends>
- <header>QVTKWidget.h</header>
+ <header>QVTKWidget2.h</header>
</customwidget>
</customwidgets>
<resources>
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
index 3dae343e109..c877543619a 100644
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -40,14 +40,14 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/vtkdiff/CMakeLists.txt AND OGS_BUILD_TESTS
install (PROGRAMS $<TARGET_FILE:vtkdiff> DESTINATION bin COMPONENT ogs_extras)
endif()
-if(NOT TARGET vtkGUISupportQt AND OGS_BUILD_GUI)
- set(VTK_QT_VERSION 5 CACHE INTERNAL "")
- include_directories(SYSTEM ${VTK_INCLUDE_DIRS})
- add_subdirectory(vtkGUISupportQt)
- if(MSVC)
- set_target_properties(vtkGUISupportQt PROPERTIES COMPILE_FLAGS /W0)
- endif()
-endif()
+#if(NOT TARGET vtkGUISupportQt AND OGS_BUILD_GUI)
+# set(VTK_QT_VERSION 5 CACHE INTERNAL "")
+# include_directories(SYSTEM ${VTK_INCLUDE_DIRS})
+# add_subdirectory(vtkGUISupportQt)
+# if(MSVC)
+# set_target_properties(vtkGUISupportQt PROPERTIES COMPILE_FLAGS /W0)
+# endif()
+#endif()
if(OGS_BUILD_SWMM)
add_subdirectory(SWMMInterface)
diff --git a/ThirdParty/vtkGUISupportQt b/ThirdParty/vtkGUISupportQt
deleted file mode 160000
index 5f5cab9dc84..00000000000
--- a/ThirdParty/vtkGUISupportQt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5f5cab9dc84524c2fe0374a29527b8467e4643f9
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index 7b47e6d7174..9bee8ee32b6 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -13,7 +13,7 @@ set(REQUIRED_SUBMODULES
${OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT}
)
if(OGS_BUILD_GUI)
- list(APPEND REQUIRED_SUBMODULES ThirdParty/vtkGUISupportQt)
+ #list(APPEND REQUIRED_SUBMODULES ThirdParty/vtkGUISupportQt)
endif()
if(OGS_BUILD_METIS)
list(APPEND REQUIRED_SUBMODULES ThirdParty/metis)
--
GitLab