diff --git a/CHANGELOG.md b/CHANGELOG.md index f8bc538f1ec..84410eab116 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ - Add Quality Declaration Document[\#910](https://github.com/eclipse-iceoryx/iceoryx/issues/910) - Make `cxx::string::capacity` a `static` method[\#979](https://github.com/eclipse-iceoryx/iceoryx/issues/979) - Restructure iceoryx tools [\#471](https://github.com/eclipse-iceoryx/iceoryx/issues/471) +- Upgrade GTest/GMock to v1.10 [\#841](https://github.com/eclipse-iceoryx/iceoryx/issues/841) **API Breaking Changes:** diff --git a/cmake/googletest/googletest.cmake.in b/cmake/googletest/googletest.cmake.in index c942922efdc..93fb0201308 100644 --- a/cmake/googletest/googletest.cmake.in +++ b/cmake/googletest/googletest.cmake.in @@ -19,26 +19,13 @@ cmake_minimum_required(VERSION 3.5) project(googletest-download NONE) include(ExternalProject) -if(WIN32) - ExternalProject_Add(googletest - GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.10.0 - SOURCE_DIR "${CMAKE_BINARY_DIR}/dependencies/googletest/src" - BINARY_DIR "${CMAKE_BINARY_DIR}/dependencies/googletest/build" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - TEST_COMMAND "" - ) -else() - ExternalProject_Add(googletest - GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.8.1 - SOURCE_DIR "${CMAKE_BINARY_DIR}/dependencies/googletest/src" - BINARY_DIR "${CMAKE_BINARY_DIR}/dependencies/googletest/build" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - TEST_COMMAND "" - ) -endif(WIN32) +ExternalProject_Add(googletest + GIT_REPOSITORY https://github.com/google/googletest.git + GIT_TAG release-1.10.0 + SOURCE_DIR "${CMAKE_BINARY_DIR}/dependencies/googletest/src" + BINARY_DIR "${CMAKE_BINARY_DIR}/dependencies/googletest/build" + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + TEST_COMMAND "" +)