From c0990333b01a1c791d343e0a92ef8d3acdcada1e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 14 Apr 2016 14:06:09 +0200
Subject: [PATCH] Use submodule for vtkGUISupportQt.
---
.gitmodules | 3 +++
Applications/DataExplorer/CMakeLists.txt | 9 ---------
Applications/DataExplorer/DataExplorer.cmake | 1 -
CMakeLists.txt | 1 +
ThirdParty/CMakeLists.txt | 9 +++++++++
ThirdParty/vtkGUISupportQt | 1 +
scripts/cmake/SubmoduleSetup.cmake | 3 +++
7 files changed, 17 insertions(+), 10 deletions(-)
create mode 160000 ThirdParty/vtkGUISupportQt
diff --git a/.gitmodules b/.gitmodules
index 72031ae442a..7bd0a67878e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,6 @@
[submodule "Tests/Data"]
path = Tests/Data
url = https://github.com/ufz/ogs-data
+[submodule "ThirdParty/vtkGUISupportQt"]
+ path = ThirdParty/vtkGUISupportQt
+ url = https://github.com/ufz/vtkGUISupportQt.git
diff --git a/Applications/DataExplorer/CMakeLists.txt b/Applications/DataExplorer/CMakeLists.txt
index 72151995500..41781bb03e5 100644
--- a/Applications/DataExplorer/CMakeLists.txt
+++ b/Applications/DataExplorer/CMakeLists.txt
@@ -1,12 +1,3 @@
-if(QT4_FOUND)
- set(VTK_QT_VERSION 4 CACHE INTERNAL "")
-else()
- set(VTK_QT_VERSION 5 CACHE INTERNAL "")
-endif()
-if(NOT TARGET vtkGUISupportQt)
- add_subdirectory(VtkModules/Qt)
-endif()
-
if(VTKFBXCONVERTER_FOUND)
add_definitions(-DVTKFBXCONVERTER_FOUND)
include_directories(${VTKFBXCONVERTER_INCLUDE_DIRS})
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 93baee23cd5..d6fd25590c0 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -28,7 +28,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/DataView/DiagramView
${CMAKE_CURRENT_SOURCE_DIR}/VtkVis
${CMAKE_CURRENT_SOURCE_DIR}/VtkAct
- ${CMAKE_CURRENT_SOURCE_DIR}/VtkModules/Qt
)
# Put moc files in a project folder
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e83d047a40..e75e89b06aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,6 +202,7 @@ include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty )
include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/gtest/include )
include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/autocheck/include )
include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/tclap/include )
+include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/vtkGUISupportQt)
add_subdirectory( Applications )
add_subdirectory( AssemblerLib )
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
index 49f7aa5ea6a..b4e6fa72adf 100644
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -46,3 +46,12 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/vtkdiff/CMakeLists.txt)
add_subdirectory(vtkdiff)
install (PROGRAMS $<TARGET_FILE:vtkdiff> DESTINATION bin COMPONENT ogs_extras)
endif()
+
+if(NOT TARGET vtkGUISupportQt AND OGS_BUILD_GUI)
+ if(QT4_FOUND)
+ set(VTK_QT_VERSION 4 CACHE INTERNAL "")
+ else()
+ set(VTK_QT_VERSION 5 CACHE INTERNAL "")
+ endif()
+ add_subdirectory(${CMAKE_SOURCE_DIR}/ThirdParty/vtkGUISupportQt)
+endif()
diff --git a/ThirdParty/vtkGUISupportQt b/ThirdParty/vtkGUISupportQt
new file mode 160000
index 00000000000..b00c860c6ed
--- /dev/null
+++ b/ThirdParty/vtkGUISupportQt
@@ -0,0 +1 @@
+Subproject commit b00c860c6edb20436bc00e5b20bc47517786413a
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index c4b9a93f55a..7f06db4c379 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -15,6 +15,9 @@ set(REQUIRED_SUBMODULES
if(OGS_BUILD_TESTS)
list(APPEND REQUIRED_SUBMODULES Tests/Data)
endif()
+if(OGS_BUILD_GUI)
+ list(APPEND REQUIRED_SUBMODULES ThirdParty/vtkGUISupportQt)
+endif()
foreach(SUBMODULE ${REQUIRED_SUBMODULES})
execute_process(
--
GitLab