From bdc312ec296402346c6536adb65caa9d19b5d64c Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Tue, 18 Dec 2018 17:41:01 +0100
Subject: [PATCH] Update CMake files for googletest submodule.
---
CMakeLists.txt | 2 +-
Tests/CMakeLists.txt | 2 +-
ThirdParty/CMakeLists.txt | 2 +-
scripts/cmake/SubmoduleSetup.cmake | 3 ++-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cee71c7146..a04ec9b3ddf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -309,7 +309,7 @@ endif()
# Add subdirectories with the projects
add_subdirectory( ThirdParty )
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/googletest/googletest/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/json/include )
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 6562a66ecb2..765ecf36d84 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -39,7 +39,7 @@ set_target_properties(testrunner PROPERTIES FOLDER Testing)
target_link_libraries(testrunner
ApplicationsFileIO
- GTest
+ gtest
MeshGeoToolsLib
MaterialLib
MeshLib
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
index ad6e02fe24a..de073ad3707 100644
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -17,7 +17,7 @@ if(MSVC)
set_target_properties(logog PROPERTIES COMPILE_FLAGS /W0)
endif()
-add_subdirectory(gtest)
+add_subdirectory(googletest)
# This is a workaround for Travis builds.
option(OGS_USE_OPTIONAL_SUBMODULES "Option for enabling optional submodules" OFF)
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index 280ef5aab8f..3942fed0944 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -7,9 +7,10 @@ endif()
set(REQUIRED_SUBMODULES
ThirdParty/autocheck
ThirdParty/cmake-modules
- ThirdParty/vtkdiff
+ ThirdParty/googletest
ThirdParty/tclap
ThirdParty/tetgen
+ ThirdParty/vtkdiff
${OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT}
)
if(OGS_BUILD_UTILS)
--
GitLab