Skip to content

Commit

Permalink
Main: Bump GTest because of issues with gcc 11.
Browse files Browse the repository at this point in the history
  • Loading branch information
erikogenvik authored and paroj committed Apr 12, 2022
1 parent 5999043 commit 269530d
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
# Configure Tests build
if (OGRE_BUILD_TESTS)

if(NOT EXISTS ${PROJECT_BINARY_DIR}/googletest-1.10.x)
if(NOT EXISTS ${PROJECT_BINARY_DIR}/googletest-1.11.0)
message(STATUS "Building gtest")
file(DOWNLOAD
https://github.com/google/googletest/archive/refs/heads/v1.10.x.tar.gz
${PROJECT_BINARY_DIR}/v1.10.x.tar.gz)
https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz
${PROJECT_BINARY_DIR}/release-1.11.0.tar.gz)
execute_process(COMMAND ${CMAKE_COMMAND}
-E tar xf v1.10.x.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
-E tar xf release-1.11.0.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
execute_process(COMMAND ${BUILD_COMMAND_COMMON}
${PROJECT_BINARY_DIR}/googletest-1.10.x
${PROJECT_BINARY_DIR}/googletest-release-1.11.0
-Dgtest_force_shared_crt=TRUE
-DBUILD_GMOCK=FALSE
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/googletest-1.10.x)
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/googletest-release-1.11.0)
execute_process(COMMAND ${CMAKE_COMMAND}
--build ${PROJECT_BINARY_DIR}/googletest-1.10.x ${BUILD_COMMAND_OPTS})
--build ${PROJECT_BINARY_DIR}/googletest-release-1.11.0 ${BUILD_COMMAND_OPTS})
endif()
find_package(GTest REQUIRED CONFIG)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Common/include)
Expand Down

0 comments on commit 269530d

Please sign in to comment.