Manually patching archive

Signed-off-by: Stephen Brawner <brawner@gmail.com>
osrf · Nov 25, 2020 · 40fc8e9 · 40fc8e9
1 parent 49750d3
commit 40fc8e9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/osrf_testing_tools_cpp/CMakeLists.txt b/osrf_testing_tools_cpp/CMakeLists.txt
@@ -17,10 +17,6 @@ add_subdirectory(src)
 
 include(CTest)
 if(BUILD_TESTING)
-  # The currently archived versions of googletest set cmake_minimum_required
-  # to < 2.8.12, which causes a deprecation policy warning for this policy
-  # with cmake 3.19.1
-  cmake_policy(SET CMP0022 NEW)
   include(cmake/osrf_testing_tools_cpp_require_googletest.cmake)
   # ensures target gtest_main exists
   osrf_testing_tools_cpp_require_googletest(VERSION_GTE 1.10

diff --git a/osrf_testing_tools_cpp/cmake/osrf_testing_tools_cpp_get_googletest_versions.cmake b/osrf_testing_tools_cpp/cmake/osrf_testing_tools_cpp_get_googletest_versions.cmake
@@ -33,18 +33,22 @@ macro(osrf_testing_tools_cpp_get_googletest_versions output_versions output_loca
     1.7.0
     1.8.1
     1.10.0
+    # Manually patched by osrf
+    1.10.0.1
   )
   # Manually maintained list of googletest locations in this package, indexed the same as versions.
   # They are relative to the VENDOR_DIR, which is configurable.
   set(${output_locations}
     "google/googletest/release-1.7.0.tar.gz"
     "google/googletest/release-1.8.1.tar.gz"
     "google/googletest/release-1.10.0.tar.gz"
+    "google/googletest/release-1.10.0.1.tar.gz"
   )
   # Manually maintained list of MD5 sums for the archives, indexed the same as the versions.
   set(${output_md5s}
     "4ff6353b2560df0afecfbda3b2763847"
     "2e6fbeb6a91310a16efe181886c59596"
     "ecd1fa65e7de707cd5c00bdac56022cd"
+    "d870ea14bb4789fa34942c7ab82fb376"
   )
-endmacro()
+endmacro()
diff --git a/osrf_testing_tools_cpp/vendor/google/googletest/googletest-external-project-add.cmake.in b/osrf_testing_tools_cpp/vendor/google/googletest/googletest-external-project-add.cmake.in
@@ -1,7 +1,7 @@
 # Based on recommendation on how to integrate googletest into a CMake project:
 #   https://github.com/google/googletest/tree/master/googletest#incorporating-into-an-existing-cmake-project
 
-cmake_minimum_required(VERSION 2.8.12...3.5)
+cmake_minimum_required(VERSION 2.8.12)
 
 project(googletest-download NONE)
 

diff --git a/osrf_testing_tools_cpp/vendor/google/googletest/release-1.10.0.1.tar.gz b/osrf_testing_tools_cpp/vendor/google/googletest/release-1.10.0.1.tar.gz