From 92b32fe039e1008d9263dc4239e3259de534356b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 3 Apr 2021 22:55:05 +0700 Subject: [PATCH] Revert "cmake: update to 3.20.0." This reverts commit 392c1eec4d0163186cfaa8b17b338fa417df894a. See: https://gitlab.kitware.com/cmake/cmake/-/issues/22024 --- ...onfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch | 13 ------------- srcpkgs/cmake/template | 7 ++++--- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch diff --git a/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch deleted file mode 100644 index d0a2860cc86..00000000000 --- a/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt -index a3d98f685f..84ef26b0fd 100644 ---- Tests/ConfigSources/CMakeLists.txt -+++ Tests/ConfigSources/CMakeLists.txt -@@ -75,7 +75,7 @@ add_custom_command(APPEND - ) - foreach(n RANGE 1 5) - set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG) -- foreach(other Release RelWithDebInfo MinSizeRel) -+ foreach(other None Release RelWithDebInfo MinSizeRel) - set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER) - endforeach() - endforeach() diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 93dbc971646..b3d3d4c5159 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,7 +1,8 @@ # Template file for 'cmake' pkgname=cmake -version=3.20.0 -revision=1 +reverts="3.20.0_1" +version=3.19.7 +revision=2 build_style=cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" @@ -16,7 +17,7 @@ maintainer="Nathan Owens " license="BSD-3-Clause, ICU" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755 +checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e export CMAKE_GENERATOR="Unix Makefiles"