diff --git a/.github/workflows/bootstrap-deps.sh b/.github/workflows/bootstrap-deps.sh index 1561f5f..0c59d9c 100755 --- a/.github/workflows/bootstrap-deps.sh +++ b/.github/workflows/bootstrap-deps.sh @@ -150,7 +150,7 @@ case "${1}" in "bionic"|"bullseye"|"focal") apt-get install -yqq --no-install-recommends python3-pip pip3 install --isolated --upgrade --no-cache-dir --force-reinstall pip - pip3 install --isolated --upgrade --no-cache-dir --force-reinstall cmake meson + pip3 install --isolated --upgrade --no-cache-dir --force-reinstall cmake==3.31.6 meson ;; esac diff --git a/setup/functions.sh b/setup/functions.sh index 0983a10..a1acba8 100644 --- a/setup/functions.sh +++ b/setup/functions.sh @@ -388,6 +388,8 @@ function build_cmake() { extraconfrules+=" -DCMAKE_BUILD_TYPE=Release" fi + extraconfrules+=" -DCMAKE_POLICY_VERSION_MINIMUM=3.5" + if [ ! -f "${pkgdir}/.stamp_configured" ]; then pushd "${pkgdir}/build" ${CMAKE_EXE_WRAPPER} ${cmake} -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_PREFIX="${PAWPAW_PREFIX}" ${extraconfrules} ..