diff --git a/.gitmodules b/.gitmodules index 7b666184bc5735128270385c28131cf79ba8fe91..c51df9e2766afb892e5f8fd513617c44eafa9704 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 80476d5e960bd5c6d713bebb8101334ff6370f5b..4b3c4df1105c21220c18afd924a8f6b08ae8f59a 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 3dae343e109b8b29c4a7a37a35e89281b265b246..c877543619afefb801b9d7996d8779fd23d861a7 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 5f5cab9dc84524c2fe0374a29527b8467e4643f9..0000000000000000000000000000000000000000 --- a/ThirdParty/vtkGUISupportQt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5f5cab9dc84524c2fe0374a29527b8467e4643f9 diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake index 7b47e6d7174f1b3fe4a6ff9f39ed5d0b4dde3e4f..9bee8ee32b6cd418d2efa964655776b1f1c20d3b 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)