Browse Source
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.
tags/v2.6.4
Andrew Belt
3 weeks ago
2 changed files with 4 additions and 4 deletions
Unified View
Diff Options
-
+0 -2dep.mk
-
+4 -2dep/Makefile
+ 0
- 2
dep.mk
View File
| @@ -40,8 +40,6 @@ UNZIP := unzip -o | |||||
| CONFIGURE := ./configure --prefix="$(DEP_PATH)" | CONFIGURE := ./configure --prefix="$(DEP_PATH)" | ||||
| CMAKE := cmake | 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 | ifdef ARCH_WIN | ||||
| CMAKE += -DCMAKE_SYSTEM_NAME=Windows | CMAKE += -DCMAKE_SYSTEM_NAME=Windows | ||||
| endif | endif | ||||
+ 4
- 2
dep/Makefile
View File
| @@ -93,7 +93,8 @@ glew-2.2.0: | |||||
| $(glew): | glew-2.2.0 | $(glew): | glew-2.2.0 | ||||
| cd glew-2.2.0 && mkdir -p build | 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 | ||||
| $(MAKE) -C glew-2.2.0/build install | $(MAKE) -C glew-2.2.0/build install | ||||
| @@ -167,7 +168,8 @@ libarchive-3.7.7: | |||||
| $(libarchive): | $(zstd) 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 && $(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 && 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 | ||||
| $(MAKE) -C libarchive-3.7.7/build install | $(MAKE) -C libarchive-3.7.7/build install | ||||