Merge pull request #8566 from radarhere/cmake_wheel

Do not attempt to install cmake a second time when building macOS or Linux wheels
python-pillow · Nov 25, 2024 · 4304414 · 4304414
2 parents d7ffb39 + 540a0b7
commit 4304414
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
@@ -76,10 +76,9 @@ function build_pkg_config {
 
 function build_brotli {
     if [ -e brotli-stamp ]; then return; fi
-    local cmake=$(get_modern_cmake)
     local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-$BROTLI_VERSION.tar.gz)
     (cd $out_dir \
-        && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \
+        && cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \
         && make install)
     touch brotli-stamp
 }