Skip to content

Commit 2a60a6a

Browse files
authored
[CMake4] Add CMAKE_POLICY_VERSION_MINIMUM=3.5 to some third_party (#75384)
1 parent 9b38ec8 commit 2a60a6a

File tree

9 files changed

+41
-8
lines changed

9 files changed

+41
-8
lines changed

cmake/external/arm_brpc.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ file(
5959

6060
file(
6161
WRITE ${ARM_BRPC_DOWNLOAD_DIR}/CMakeLists.txt
62-
"PROJECT(ARM_BRPC)\n" "cmake_minimum_required(VERSION 3.0)\n"
62+
"PROJECT(ARM_BRPC)\n" "cmake_minimum_required(VERSION 3.5)\n"
6363
"install(DIRECTORY ${ARM_BRPC_DST_DIR} ${ARM_BRPC_DST_DIR} \n"
6464
" DESTINATION ${ARM_BRPC_NAME})\n")
6565

cmake/external/box_ps.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ file(
5252

5353
file(
5454
WRITE ${BOX_PS_DOWNLOAD_DIR}/CMakeLists.txt
55-
"PROJECT(BOX_PS)\n" "cmake_minimum_required(VERSION 3.0)\n"
55+
"PROJECT(BOX_PS)\n" "cmake_minimum_required(VERSION 3.5)\n"
5656
"install(DIRECTORY ./include ./lib \n"
5757
" DESTINATION ${BOX_PS_DST_DIR})\n")
5858
ExternalProject_Add(

cmake/external/gtest.cmake

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,16 @@ set(GTEST_TAG release-1.8.1)
3131
set(GTEST_SOURCE_DIR ${THIRD_PARTY_PATH}/gtest/src/extern_gtest)
3232
include_directories(${GTEST_INCLUDE_DIR})
3333

34+
# For CMake >= 4.0.0, set policy compatibility for gtest's CMake.
35+
set(GTEST_POLICY_ARGS "")
36+
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0.0")
37+
message(
38+
WARNING
39+
"gtest: forcing CMake policy compatibility for CMake >= 4.0 (CMAKE_POLICY_VERSION_MINIMUM=3.5)"
40+
)
41+
set(GTEST_POLICY_ARGS -DCMAKE_POLICY_VERSION_MINIMUM=3.5)
42+
endif()
43+
3444
if(WIN32)
3545
set(GTEST_LIBRARIES
3646
"${GTEST_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/gtest.lib"
@@ -100,6 +110,7 @@ if(WIN32)
100110
-Dgtest_disable_pthreads=ON
101111
-Dgtest_force_shared_crt=ON
102112
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
113+
${GTEST_POLICY_ARGS}
103114
${EXTERNAL_OPTIONAL_ARGS}
104115
CMAKE_CACHE_ARGS
105116
-DCMAKE_INSTALL_PREFIX:PATH=${GTEST_INSTALL_DIR}
@@ -132,6 +143,7 @@ else()
132143
-Dgtest_disable_pthreads=ON
133144
-Dgtest_force_shared_crt=ON
134145
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
146+
${GTEST_POLICY_ARGS}
135147
${EXTERNAL_OPTIONAL_ARGS}
136148
CMAKE_CACHE_ARGS
137149
-DCMAKE_INSTALL_PREFIX:PATH=${GTEST_INSTALL_DIR}

cmake/external/libmct.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ endif()
7878

7979
file(
8080
WRITE ${LIBMCT_DOWNLOAD_DIR}/CMakeLists.txt
81-
"PROJECT(LIBMCT)\n" "cmake_minimum_required(VERSION 3.0)\n"
81+
"PROJECT(LIBMCT)\n" "cmake_minimum_required(VERSION 3.5)\n"
8282
"install(DIRECTORY ./include ./lib \n"
8383
" DESTINATION ${LIBMCT_DST_DIR})\n")
8484

cmake/external/openblas.cmake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ if(WITH_LOONGARCH)
3838
set(CBLAS_TAG v0.3.18)
3939
endif()
4040

41+
# For CMake >= 4.0.0, set policy compatibility for OpenBLAS's CMake.
42+
# Only for Windows builds that use CMAKE_ARGS
43+
if(WIN32 AND CMAKE_VERSION VERSION_GREATER_EQUAL "4.0.0")
44+
message(
45+
WARNING
46+
"OpenBLAS: forcing CMake policy compatibility for CMake >= 4.0 (CMAKE_POLICY_VERSION_MINIMUM=3.5)"
47+
)
48+
set(OPENBLAS_POLICY_ARGS -DCMAKE_POLICY_VERSION_MINIMUM=3.5)
49+
endif()
50+
4151
file(GLOB CBLAS_SOURCE_FILE_LIST ${CBLAS_SOURCE_DIR})
4252
list(LENGTH CBLAS_SOURCE_FILE_LIST RES_LEN)
4353
if(RES_LEN EQUAL 0)
@@ -117,6 +127,7 @@ else()
117127
-DBUILD_SHARED_LIBS=ON
118128
-DCMAKE_VERBOSE_MAKEFILE=OFF
119129
-DMSVC_STATIC_CRT=${MSVC_STATIC_CRT}
130+
${OPENBLAS_POLICY_ARGS}
120131
${EXTERNAL_OPTIONAL_ARGS}
121132
CMAKE_CACHE_ARGS
122133
-DCMAKE_INSTALL_PREFIX:PATH=${CBLAS_INSTALL_DIR}

cmake/external/pslib_brpc.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ include_directories(${PSLIB_BRPC_INC_DIR})
4747

4848
file(
4949
WRITE ${PSLIB_BRPC_DOWNLOAD_DIR}/CMakeLists.txt
50-
"PROJECT(PSLIB_BRPC)\n" "cmake_minimum_required(VERSION 3.0)\n"
50+
"PROJECT(PSLIB_BRPC)\n" "cmake_minimum_required(VERSION 3.5)\n"
5151
"install(DIRECTORY ${PSLIB_BRPC_NAME}/include ${PSLIB_BRPC_NAME}/lib \n"
5252
" DESTINATION ${PSLIB_BRPC_DST_DIR})\n")
5353

cmake/external/xpu.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}" "${XPU_INSTALL_DIR}/lib")
190190

191191
file(
192192
WRITE ${XPU_DOWNLOAD_DIR}/CMakeLists.txt
193-
"PROJECT(XPU)\n" "cmake_minimum_required(VERSION 3.0)\n"
193+
"PROJECT(XPU)\n" "cmake_minimum_required(VERSION 3.5)\n"
194194
"install(DIRECTORY xpu/include xpu/lib \n"
195195
" DESTINATION ${XPU_INSTALL_DIR})\n")
196196

cmake/external/xxhash.cmake

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ set(XXHASH_INCLUDE_DIR "${XXHASH_INSTALL_DIR}/include")
2121
set(XXHASH_TAG v0.6.5)
2222
set(SOURCE_DIR ${PADDLE_SOURCE_DIR}/third_party/xxhash)
2323

24+
# For CMake >= 4.0.0, set policy compatibility for xxhash's CMake.
25+
# Only for Windows builds that use CMAKE_ARGS
26+
if(WIN32 AND CMAKE_VERSION VERSION_GREATER_EQUAL "4.0.0")
27+
message(
28+
WARNING
29+
"xxhash: forcing CMake policy compatibility for CMake >= 4.0 (CMAKE_POLICY_VERSION_MINIMUM=3.5)"
30+
)
31+
set(XXHASH_POLICY_ARGS -DCMAKE_POLICY_VERSION_MINIMUM=3.5)
32+
endif()
33+
2434
include_directories(${XXHASH_INCLUDE_DIR})
2535

2636
if(APPLE)
@@ -75,7 +85,8 @@ if(WIN32)
7585
-DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
7686
-DCMAKE_C_FLAGS=${XXHASH_CMAKE_C_FLAGS}
7787
-DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
78-
-DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} ${OPTIONAL_CACHE_ARGS}
88+
-DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} ${XXHASH_POLICY_ARGS}
89+
${OPTIONAL_CACHE_ARGS}
7990
TEST_COMMAND ""
8091
BUILD_BYPRODUCTS ${XXHASH_LIBRARIES})
8192
else()

cmake/generic.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,7 @@ function(merge_static_libs TARGET_NAME)
292292
POST_BUILD
293293
COMMENT "Merge and generate static lib: lib${TARGET_NAME}.a"
294294
COMMAND ${CMAKE_AR} -M < ${mri_file}
295-
COMMAND ${CMAKE_RANLIB} "$<TARGET_FILE:${TARGET_NAME}>" DEPENDS
296-
${mri_file}
295+
COMMAND ${CMAKE_RANLIB} "$<TARGET_FILE:${TARGET_NAME}>"
297296
VERBATIM)
298297
endif()
299298

0 commit comments

Comments
 (0)