diff --git a/cmake/gtest/CMakeLists.txt.in b/cmake/gtest/CMakeLists.txt.in index 6206d8cfde..e580e00bf8 100644 --- a/cmake/gtest/CMakeLists.txt.in +++ b/cmake/gtest/CMakeLists.txt.in @@ -4,7 +4,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest - URL https://github.com/google/googletest/archive/58d77fa8070e8cec2dc1ed015d66b454c8d78850.zip # 1.12.1 + URL https://github.com/google/googletest/archive/b796f7d44681514f58a683a3a71ff17c94edb0c1.zip # 1.13 SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" CONFIGURE_COMMAND "" diff --git a/cmake/gtest/gtest.cmake b/cmake/gtest/gtest.cmake index 3b74cfb211..7aa70e04d9 100644 --- a/cmake/gtest/gtest.cmake +++ b/cmake/gtest/gtest.cmake @@ -46,4 +46,7 @@ add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src ${CMAKE_CURRENT_BINA get_target_property(GTEST_COMPILE_FLAGS gtest COMPILE_OPTIONS) list(REMOVE_ITEM GTEST_COMPILE_FLAGS "-include") list(REMOVE_ITEM GTEST_COMPILE_FLAGS "visibility.h") +# Remove float warnings added by PX4 which trigger in gtest-printers.h +list(REMOVE_ITEM GTEST_COMPILE_FLAGS "-Wdouble-promotion") +list(REMOVE_ITEM GTEST_COMPILE_FLAGS "-Wfloat-equal") set_target_properties(gtest PROPERTIES COMPILE_OPTIONS "${GTEST_COMPILE_FLAGS}")