diff --git a/build/cmake/toolchain/linux.toolchain.cmake b/build/cmake/toolchain/linux.toolchain.cmake index 6562fba4..40fa3c67 100755 --- a/build/cmake/toolchain/linux.toolchain.cmake +++ b/build/cmake/toolchain/linux.toolchain.cmake @@ -17,7 +17,8 @@ set(CMAKE_SYSTEM_PROCESSOR arm) # Version of the system set(CMAKE_SYSTEM_VERSION 1) - +cmake_policy(SET CMP0011 NEW) +cmake_policy(SET CMP0005 NEW) add_definitions(-Wall -O2 -Os) add_definitions(-Wno-unused-local-typedefs) diff --git a/external/gtest/build_gtest.sh b/external/gtest/build_gtest.sh index 7a07e368..206676f5 100644 --- a/external/gtest/build_gtest.sh +++ b/external/gtest/build_gtest.sh @@ -17,7 +17,7 @@ if [ ! -f "./googletest-release-1.11.0/googlemock/lib/libgtest.a" ] || [ ! -f ". rm CMakeCache.txt CMakeFiles/ cmake_install.cmake Makefile lib/ -rf case $platform in "linux") - echo "==Compile linux." + echo "==Compile gtest linux." cmake -DCMAKE_TOOLCHAIN_FILE=$PLATFORM_PATH/build/cmake/toolchain/linux.toolchain.cmake . make ;; diff --git a/external/gtest/modify/CMakeList_gmock.txt b/external/gtest/modify/CMakeList_gmock.txt index fae4187c..d130ea94 100644 --- a/external/gtest/modify/CMakeList_gmock.txt +++ b/external/gtest/modify/CMakeList_gmock.txt @@ -45,7 +45,7 @@ if (CMAKE_VERSION VERSION_LESS 3.0) project(gmock CXX C) else() cmake_policy(SET CMP0048 NEW) - project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) + project(gmock VERSION 1.11.0 LANGUAGES CXX C) endif() cmake_minimum_required(VERSION 2.8.12)