Merge commit '38b05ced3b169069adf898c4a432aba03c409262' into develop

vendor/README

@@ -1,6 +1,7 @@
 This directory contains external projects, taken from the following locations:
 googletest: https://github.com/google/googletest/tree/release-1.10.0
  - changed: https://github.com/google/googletest/pull/2514
+ - changed: In CMakeLists.txt, googletest/CMakeLists.txt and googlemock/CMakeLists.txt, add cmake_policy(SET CMP0069 NEW) to silence a warning
 cryptopp: https://github.com/weidai11/cryptopp/tree/CRYPTOPP_8_2_0
  - changed: added CMakeLists.txt and cryptopp-config.cmake from https://github.com/noloader/cryptopp-cmake/tree/CRYPTOPP_8_2_0
  - changed: commented out line including winapifamily.h in CMakeLists.txt

vendor/googletest/gtest/CMakeLists.txt

@@ -2,6 +2,7 @@
 # internally.
 
 cmake_minimum_required(VERSION 2.8.8)
+cmake_policy(SET CMP0069 NEW)
 
 if (POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)

vendor/googletest/gtest/googlemock/CMakeLists.txt

@@ -43,6 +43,7 @@ else()
   project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
 endif()
 cmake_minimum_required(VERSION 2.6.4)
+cmake_policy(SET CMP0069 NEW)
 
 if (COMMAND set_up_hermetic_build)
   set_up_hermetic_build()

vendor/googletest/gtest/googletest/CMakeLists.txt

@@ -54,6 +54,7 @@ else()
   project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
 endif()
 cmake_minimum_required(VERSION 2.6.4)
+cmake_policy(SET CMP0069 NEW)
 
 if (POLICY CMP0063) # Visibility
   cmake_policy(SET CMP0063 NEW)