From c467883e54cefa4b016f9f5c72b167c7cb61bf52 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 8 Feb 2021 18:18:28 +0100
Subject: [PATCH] Removed submodule googletest.
---
.gitmodules | 3 ---
CMakeLists.txt | 1 -
ThirdParty/CMakeLists.txt | 6 ------
ThirdParty/googletest | 1 -
scripts/cmake/SubmoduleSetup.cmake | 1 -
5 files changed, 12 deletions(-)
delete mode 160000 ThirdParty/googletest
diff --git a/.gitmodules b/.gitmodules
index 85f79d96f34..56e05dc20ec 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,9 +22,6 @@
[submodule "ThirdParty/pybind11"]
path = ThirdParty/pybind11
url = https://github.com/pybind/pybind11.git
-[submodule "ThirdParty/googletest"]
- path = ThirdParty/googletest
- url = https://github.com/google/googletest.git
[submodule "ThirdParty/exprtk"]
path = ThirdParty/exprtk
url = https://github.com/ArashPartow/exprtk.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 677143e3cfa..a709f2ecba6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -223,7 +223,6 @@ add_subdirectory(ThirdParty)
include_directories(
SYSTEM
${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty
- ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/googletest/googletest/include
${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/autocheck/include
${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/tclap/include
${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/json/include
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
index c42ad6743d4..7bbfabba045 100644
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -1,12 +1,6 @@
add_subdirectory(spdlog)
set(DISABLE_WARNINGS_TARGETS spdlog)
-if(BUILD_TESTING)
- set(gtest_force_shared_crt ON CACHE INTERNAL "") # Use dynamic MSVC runtime
- set(INSTALL_GTEST OFF CACHE INTERNAL "")
- add_subdirectory(googletest)
-endif()
-
# This is a workaround for Travis builds.
option(OGS_USE_OPTIONAL_SUBMODULES "Option for enabling optional submodules" OFF)
diff --git a/ThirdParty/googletest b/ThirdParty/googletest
deleted file mode 160000
index 389cb68b871..00000000000
--- a/ThirdParty/googletest
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 389cb68b87193358358ae87cc56d257fd0d80189
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index 865fbceb3cd..17e1c19d44f 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -12,7 +12,6 @@ set(REQUIRED_SUBMODULES
ThirdParty/autocheck
ThirdParty/cmake-modules
ThirdParty/exprtk
- ThirdParty/googletest
ThirdParty/iphreeqc/src
ThirdParty/json-cmake
ThirdParty/spdlog
--
GitLab