Skip to content

Commit c137ff0

Browse files
committed
try use 3.29
1 parent 5987e47 commit c137ff0

File tree

2 files changed

+5
-30
lines changed

2 files changed

+5
-30
lines changed

.github/workflows/paddle-build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ jobs:
4343
- { os: macos-13, name: openblas, cmake_flags: "-DWITH_ONNXRUNTIME=ON" }
4444
- { os: macos-15, name: openblas, cmake_flags: "-DWITH_ARM=ON" }
4545
steps:
46+
- name: Setup CMake 3.29.x
47+
# Downgrade to CMake 3.29 to avoid policy / ExternalProject regressions seen in 4.12
48+
uses: jwlawson/actions-setup-cmake@v2
49+
with:
50+
cmake-version: 3.29.6
4651
- name: Setup dependencies
4752
shell: bash
4853
run: |

build/cmake.patch

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,36 +23,6 @@ index 90184b6fde..109282af09 100755
2323

2424
get_directory_property(all_inc_dirs INCLUDE_DIRECTORIES)
2525
list(JOIN all_inc_dirs "\r\n" all_inc_dirs)
26-
diff --git a/cmake/external/gflags.cmake b/cmake/external/gflags.cmake
27-
index b36006a55c..f304d20f9f 100755
28-
--- a/cmake/external/gflags.cmake
29-
+++ b/cmake/external/gflags.cmake
30-
@@ -45,12 +45,6 @@ ExternalProject_Add(
31-
INSTALL_COMMAND ${INSTALL_COMMAND}
32-
CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
33-
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
34-
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
35-
- -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
36-
- -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
37-
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
38-
- -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
39-
- -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}
40-
-DBUILD_STATIC_LIBS=ON
41-
-DCMAKE_INSTALL_PREFIX=${GFLAGS_INSTALL_DIR}
42-
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
43-
@@ -61,6 +55,12 @@ ExternalProject_Add(
44-
-DCMAKE_INSTALL_PREFIX:PATH=${GFLAGS_INSTALL_DIR}
45-
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
46-
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
47-
+ -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
48-
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}
49-
+ -DCMAKE_CXX_FLAGS_DEBUG:STRING=${CMAKE_CXX_FLAGS_DEBUG}
50-
+ -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
51-
+ -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG}
52-
+ -DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}
53-
BUILD_BYPRODUCTS ${GFLAGS_LIBRARIES})
54-
55-
add_library(gflags STATIC IMPORTED GLOBAL)
5626
diff --git a/cmake/generic.cmake b/cmake/generic.cmake
5727
index e977207378..e3756a5e1d 100644
5828
--- a/cmake/generic.cmake

0 commit comments

Comments
 (0)