Germany/embedded-framework
7
0
Fork 0
mirror of https://gitee.com/jiuyilian/embedded-framework.git synced 2025-01-06 10:16:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve:cmake warning.

Browse Source
This commit is contained in:
Fancy code 2024-05-25 17:40:12 +08:00
parent 8c5eee015d
commit ce1cbbb9b4
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/cmake/toolchain/linux.toolchain.cmake
View File

@ -17,7 +17,8 @@ set(CMAKE_SYSTEM_PROCESSOR arm)
# Version of the system # Version of the system
set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_VERSION 1)
cmake_policy(SET CMP0011 NEW)
cmake_policy(SET CMP0005 NEW)
add_definitions(-Wall -O2 -Os) add_definitions(-Wall -O2 -Os)
add_definitions(-Wno-unused-local-typedefs) add_definitions(-Wno-unused-local-typedefs)

2
external/gtest/build_gtest.sh vendored
View File

@ -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 rm CMakeCache.txt CMakeFiles/ cmake_install.cmake Makefile lib/ -rf
case $platform in case $platform in
"linux") "linux")
echo "==Compile linux." echo "==Compile gtest linux."
cmake -DCMAKE_TOOLCHAIN_FILE=$PLATFORM_PATH/build/cmake/toolchain/linux.toolchain.cmake . cmake -DCMAKE_TOOLCHAIN_FILE=$PLATFORM_PATH/build/cmake/toolchain/linux.toolchain.cmake .
make make
;; ;;

2
external/gtest/modify/CMakeList_gmock.txt vendored
View File

@ -45,7 +45,7 @@ if (CMAKE_VERSION VERSION_LESS 3.0)
project(gmock CXX C) project(gmock CXX C)
else() else()
cmake_policy(SET CMP0048 NEW) cmake_policy(SET CMP0048 NEW)
project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) project(gmock VERSION 1.11.0 LANGUAGES CXX C)
endif() endif()
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)