From fbf4d91b050efe3ad62c313d73e22bf2a937361e Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Wed, 16 Apr 2025 16:59:54 -0400 Subject: [PATCH] Force `CMAKE_POLICY_VERSION_MINIMUM=3.5` for only GLEW and libarchive, not all Rack/plugin deps. Updating the Cmake policy version to support Cmake 4 should be the responsibility of each dep. --- dep.mk | 2 -- dep/Makefile | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dep.mk b/dep.mk index e7ccc3b7..292b18a1 100644 --- a/dep.mk +++ b/dep.mk @@ -40,8 +40,6 @@ UNZIP := unzip -o CONFIGURE := ./configure --prefix="$(DEP_PATH)" CMAKE := cmake -# Cmake 4 no longer emulates behavior from Cmake <3.5. But most libraries are fine if we use policies from a higher Cmake version. -CMAKE += -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ifdef ARCH_WIN CMAKE += -DCMAKE_SYSTEM_NAME=Windows endif diff --git a/dep/Makefile b/dep/Makefile index 87ef8192..f519fa8d 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -93,7 +93,8 @@ glew-2.2.0: $(glew): | glew-2.2.0 cd glew-2.2.0 && mkdir -p build - cd glew-2.2.0/build && $(CMAKE) ./cmake + # Increase policy version to support building with Cmake 4 + cd glew-2.2.0/build && $(CMAKE) -DCMAKE_POLICY_VERSION_MINIMUM=3.5 cmake $(MAKE) -C glew-2.2.0/build $(MAKE) -C glew-2.2.0/build install @@ -167,7 +168,8 @@ libarchive-3.7.7: $(libarchive): | $(zstd) libarchive-3.7.7 #cd libarchive-3.7.7 && $(CONFIGURE) --enable-shared=no --enable-static=yes --disable-bsdtar --disable-bsdcat --disable-bsdcpio --disable-posix-regex-lib --disable-xattr --disable-acl --without-zlib --without-bz2lib --without-libb2 --without-iconv --without-lz4 --without-lzma --without-cng --without-openssl --without-xml2 --without-expat cd libarchive-3.7.7 && mkdir -p build - cd libarchive-3.7.7/build && $(CMAKE) -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DENABLE_ACL=OFF -DENABLE_BZip2=OFF -DENABLE_CAT=OFF -DENABLE_CNG=OFF -DENABLE_COVERAGE=OFF -DENABLE_CPIO=OFF -DENABLE_EXPAT=OFF -DENABLE_ICONV=OFF -DENABLE_LIBB2=OFF -DENABLE_LIBXML2=OFF -DENABLE_LZ4=OFF -DENABLE_LZMA=OFF -DENABLE_LZO=OFF -DENABLE_MBEDTLS=OFF -DENABLE_NETTLE=OFF -DENABLE_OPENSSL=OFF -DENABLE_TAR=OFF -DENABLE_TEST=OFF -DENABLE_UNZIP=OFF -DENABLE_WERROR=OFF -DENABLE_XATTR=OFF -DENABLE_ZLIB=OFF -DENABLE_ZSTD=ON -DWINDOWS_VERSION="WIN7" -DZSTD_INCLUDE_DIR:PATH=$(DEP_PATH)/include -DZSTD_LIBRARY=$(DEP_PATH)/lib/libzstd.a .. + # Increase policy version to support building with Cmake 4 + cd libarchive-3.7.7/build && $(CMAKE) -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DENABLE_ACL=OFF -DENABLE_BZip2=OFF -DENABLE_CAT=OFF -DENABLE_CNG=OFF -DENABLE_COVERAGE=OFF -DENABLE_CPIO=OFF -DENABLE_EXPAT=OFF -DENABLE_ICONV=OFF -DENABLE_LIBB2=OFF -DENABLE_LIBXML2=OFF -DENABLE_LZ4=OFF -DENABLE_LZMA=OFF -DENABLE_LZO=OFF -DENABLE_MBEDTLS=OFF -DENABLE_NETTLE=OFF -DENABLE_OPENSSL=OFF -DENABLE_TAR=OFF -DENABLE_TEST=OFF -DENABLE_UNZIP=OFF -DENABLE_WERROR=OFF -DENABLE_XATTR=OFF -DENABLE_ZLIB=OFF -DENABLE_ZSTD=ON -DWINDOWS_VERSION="WIN7" -DZSTD_INCLUDE_DIR:PATH=$(DEP_PATH)/include -DZSTD_LIBRARY=$(DEP_PATH)/lib/libzstd.a .. $(MAKE) -C libarchive-3.7.7/build $(MAKE) -C libarchive-3.7.7/build install