Skip to content
Snippets Groups Projects
Commit bdc312ec authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

Update CMake files for googletest submodule.

parent 8d3ae195
No related branches found
No related tags found
No related merge requests found
...@@ -309,7 +309,7 @@ endif() ...@@ -309,7 +309,7 @@ endif()
# Add subdirectories with the projects # Add subdirectories with the projects
add_subdirectory( ThirdParty ) add_subdirectory( ThirdParty )
include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/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/autocheck/include )
include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/tclap/include ) include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/tclap/include )
include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/json/include ) include_directories( SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/json/include )
......
...@@ -39,7 +39,7 @@ set_target_properties(testrunner PROPERTIES FOLDER Testing) ...@@ -39,7 +39,7 @@ set_target_properties(testrunner PROPERTIES FOLDER Testing)
target_link_libraries(testrunner target_link_libraries(testrunner
ApplicationsFileIO ApplicationsFileIO
GTest gtest
MeshGeoToolsLib MeshGeoToolsLib
MaterialLib MaterialLib
MeshLib MeshLib
......
...@@ -17,7 +17,7 @@ if(MSVC) ...@@ -17,7 +17,7 @@ if(MSVC)
set_target_properties(logog PROPERTIES COMPILE_FLAGS /W0) set_target_properties(logog PROPERTIES COMPILE_FLAGS /W0)
endif() endif()
add_subdirectory(gtest) add_subdirectory(googletest)
# This is a workaround for Travis builds. # This is a workaround for Travis builds.
option(OGS_USE_OPTIONAL_SUBMODULES "Option for enabling optional submodules" OFF) option(OGS_USE_OPTIONAL_SUBMODULES "Option for enabling optional submodules" OFF)
......
...@@ -7,9 +7,10 @@ endif() ...@@ -7,9 +7,10 @@ endif()
set(REQUIRED_SUBMODULES set(REQUIRED_SUBMODULES
ThirdParty/autocheck ThirdParty/autocheck
ThirdParty/cmake-modules ThirdParty/cmake-modules
ThirdParty/vtkdiff ThirdParty/googletest
ThirdParty/tclap ThirdParty/tclap
ThirdParty/tetgen ThirdParty/tetgen
ThirdParty/vtkdiff
${OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT} ${OGS_ADDITIONAL_SUBMODULES_TO_CHECKOUT}
) )
if(OGS_BUILD_UTILS) if(OGS_BUILD_UTILS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment