From 26167969a7794145a922028964d9252e30e56aed Mon Sep 17 00:00:00 2001
From: tianshuo78520a <707759223@qq.com>
Date: Mon, 25 Apr 2022 10:36:27 +0800
Subject: [PATCH] Cherry-pick[41456] Update Mac cmake version >=3.15 (#42193)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

官网中写到cmake版本最低3.15，更新cmake设置
---
 CMakeLists.txt             | 2 +-
 cmake/external/boost.cmake | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6988434996b..0b830484127 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ if(APPLE AND WITH_ARM)
     cmake_minimum_required(VERSION 3.19.2)
     cmake_policy(VERSION 3.19.2)
 else(APPLE AND WITH_ARM)
-    cmake_minimum_required(VERSION 3.10)
+    cmake_minimum_required(VERSION 3.15)
     cmake_policy(VERSION 3.10)
 endif(APPLE AND WITH_ARM)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
diff --git a/cmake/external/boost.cmake b/cmake/external/boost.cmake
index 69eb62bfdc6..e47b608341b 100644
--- a/cmake/external/boost.cmake
+++ b/cmake/external/boost.cmake
@@ -32,7 +32,6 @@ set(BOOST_URL   "http://paddlepaddledeps.bj.bcebos.com/${BOOST_TAR}.tar.gz" CACH
 MESSAGE(STATUS "BOOST_VERSION: ${BOOST_VER}, BOOST_URL: ${BOOST_URL}")
 
 set(BOOST_PREFIX_DIR ${THIRD_PARTY_PATH}/boost)
-
 set(BOOST_INCLUDE_DIR "${THIRD_PARTY_PATH}/boost/src/extern_boost" CACHE PATH "boost include directory." FORCE)
 set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM 1)
 include_directories(${BOOST_INCLUDE_DIR})
-- 
GitLab