diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cee71c71463810957f7ffcdee16b727c1f3e357..a04ec9b3ddfd2ded556c3109fdf025bb09b03d2e 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 6562a66ecb2db36e6691ffaeb7dc960e6c6c7e1c..765ecf36d84e3d6207e9ddd3a3dbe1b3030ca90d 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 ad6e02fe24ad8208ca370998e6354c3aa2c1c210..de073ad370783aa0a27e3b986683a41f401f3597 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 280ef5aab8f61b372e9a9277b4117de180bb4637..3942fed09441b63524d9902ca6cda5936b38eff0 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)