Update cmake minimum version to 2.8.12 (#61)

* Update cmake minimum version to 2.8.12 Signed-off-by: Stephen Brawner <brawner@gmail.com> * Try setting policy explicitly Signed-off-by: Stephen Brawner <brawner@gmail.com> * Trying this Signed-off-by: Stephen Brawner <brawner@gmail.com> * Manually patching archive Signed-off-by: Stephen Brawner <brawner@gmail.com>
osrf · Apr 21, 2021 · 72e1545 · 72e1545
1 parent 0e51ed6
commit 72e1545
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
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
@@ -32,16 +32,20 @@ macro(osrf_testing_tools_cpp_get_googletest_versions output_versions output_loca
   set(${output_versions}
     1.7.0
     1.8.1
+    # 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.1.tar.gz"
   )
   # Manually maintained list of MD5 sums for the archives, indexed the same as the versions.
   set(${output_md5s}
     "4ff6353b2560df0afecfbda3b2763847"
     "2e6fbeb6a91310a16efe181886c59596"
+    "4e8365c807e1ba7814234460d30ef939"
   )
-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.2)
+cmake_minimum_required(VERSION 2.8.12)
 
 project(googletest-download NONE)
 
@@ -21,4 +21,4 @@ ExternalProject_Add(googletest
   LOG_BUILD         OFF
   LOG_TEST          OFF
   LOG_INSTALL       OFF
-)
+)
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