Sync from SUSE:SLFO:Main cmake revision a4f9c54428b5d0928f617531363611d2

This commit is contained in:
2025-03-28 12:40:24 +01:00
parent 25b7f229aa
commit a6861337c8
9 changed files with 194 additions and 38 deletions

View File

@@ -1,17 +0,0 @@
408aa6889fc25fea8c5280065f4eeac3e330d66bae2a212630cf4353f886c781 cmake-3.30.3-files-v1.json
43d5882e5db6d4331d3097d3a4ff92e53cd19987e7da9ffa6c833d22f9ca7aaa cmake-3.30.3-linux-aarch64.sh
420f17c58de4ed8b53c1055a34318aec5c06d94b04dac9dd3c72861dfdc99d52 cmake-3.30.3-linux-aarch64.tar.gz
54f93e25d728b742f9ffb51d7093b883ee4332d9923b427e39f8f46fb74d6e68 cmake-3.30.3-linux-x86_64.sh
4a5864e9ff0d7945731fe6d14afb61490bf0ec154527bc3af0456bd8fa90decb cmake-3.30.3-linux-x86_64.tar.gz
f5aabecc73d9d373d298ca1f13798f36b4cc96932cc86ea4e3833442508bb99d cmake-3.30.3-macos-universal.dmg
cec873b2822f1c34bc3e2fd6ec9fdd1c4c6bc850edfeba47524f23cdfeb1c8c4 cmake-3.30.3-macos-universal.tar.gz
9c967b068be1744910a1f604f2cc78d5b0a67a8609baf3fc3dbadf92f8c2b3e4 cmake-3.30.3-macos10.10-universal.dmg
8ebca4b3cea5c7f39f5bff8ad1ca9b7e8267d758375955f8f14f385d6827fc2e cmake-3.30.3-macos10.10-universal.tar.gz
b6061598d6bd10089b07db3f0cce1a36202ec28fe1b0a4564f1c4535c8edba3c cmake-3.30.3-windows-arm64.msi
8b35d500f6c33383385990405e4a3d307c570e5a0043eab9b781422b078637de cmake-3.30.3-windows-arm64.zip
f7e05fb104fed42db7581a8dc25ecddfa432d8d3595d3ed9e8c9386837416c30 cmake-3.30.3-windows-i386.msi
5e4464a6d5af15e1a45fa376ac03b6bd63b35b7d93a2e93a2dd6215b39513a3f cmake-3.30.3-windows-i386.zip
097900d46f393432a518f91e0145410e99b2fb7dc2a8e807aeafeeaefd40e080 cmake-3.30.3-windows-x86_64.msi
2b339f738d3dea408d1523c99bb24d2d82b169f5749a698225ecfdf2f0d1c314 cmake-3.30.3-windows-x86_64.zip
6d5de15b6715091df7f5441007425264bdd477809f80333fdf95f846aaff88e4 cmake-3.30.3.tar.gz
64dedbc7bd0433c072371bca0b03fd9f0a7d2b559c98816a7967197417780e8e cmake-3.30.3.zip

View File

@@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmbQ1eoACgkQLSzvEDSS
FoTD3xAAmxkdm6M1K78LpyamxREi7yIu+g/OAhh6KzBRbEr3LdaugS17Emx+QBE+
T4XOgzjv1fnDn1Tv/90Mk1onQi+gCoLO+uCLzBJ6Tag2esCzJRrwL47KGwIJYO5L
qFvxPU8SGK3cLzeQSuTSka07mUf9lXMoVj8TSIRc3/ZqrIHLK5MHQmVVUoi5y50T
DgHzPz3nrge8O8Rmrs7UPfiDYmWkOWdGlErDdiSlIBwLUPeGMZQl7W5TM3HoALTG
NEZwjhlgTDt3lRkQsYvCQdd/N4NMUlbCyW/IrIuhaXmhGoYYxUGBky4zSOg0koYw
mQB6pmL7WVElMCPUnBdxjeyK4wL83gb/l2dXL4EQ0pJH/oKUQrQPSnO/DWhfBMqv
jw6z9dzgBDr1K02A01zx6FLwJl9Bmu22SBQSYk42Pc8Y3v/05blX7MudPumfNaYh
AAjMJ9TBQI+gqfIlvSWRHaR71KnCm2new9fCt3GA1XP4P5ChujtjL7vVzBIXFkVt
MGZCp+z44DDfoUViRWp37FSFInFqn9wz89/Mxmp2oW9A29w4GOob8XuIt0prWwds
T8E0NLcLcZC4zJfhVtZfQC52uEDVpaSOgbzODC+3bovtrgW/lM22fdksNPCxF8Oy
XQUwGDKJHHy2uxc8Jludy3ss1PSwpk3cu5Yiuto5uTrmZYUtA4Y=
=uwIX
-----END PGP SIGNATURE-----

BIN
cmake-3.30.3.tar.gz (Stored with Git LFS)

Binary file not shown.

17
cmake-3.31.6-SHA-256.txt Normal file
View File

@@ -0,0 +1,17 @@
30ad6b4570ee51c0ab1f3e57e2432f0def256f89bdce00f8a338d74765bfeaee cmake-3.31.6-files-v1.json
10a0ac7e70b751d9f2aabc5e6c8ca57b0ede7ae1dbdd1ca8075954a0d97a443c cmake-3.31.6-linux-aarch64.sh
b4cc788d63112b2749b40627e719eb5d3b8ed8f00c36d77189f4019cfe64bc9e cmake-3.31.6-linux-aarch64.tar.gz
518c76bd18cc4ca5faab891db69b1289dc1bf134f394f0983a19576711b95210 cmake-3.31.6-linux-x86_64.sh
5a1133ff103c71eb5120e2cc3de922733e7d8a26a98ae716397e8676adb367bf cmake-3.31.6-linux-x86_64.tar.gz
80c1f8da45dc4710863687a2841fa4254bdda11e67a7ace33c1925cba90ae91d cmake-3.31.6-macos-universal.dmg
330b9514f5112e5ed4fb08b8b05803b776fd9b539a6ae12927d14dcc0ee2ba8d cmake-3.31.6-macos-universal.tar.gz
35558f1ce408aef4b929b6b9bca41d06f6db9947653cb1c404e7f87446d19aa9 cmake-3.31.6-macos10.10-universal.dmg
dc49fe67e0841e1d21b9e694d4858bbc06118165be5ebd8da0f2028216d56e6c cmake-3.31.6-macos10.10-universal.tar.gz
af84acfc44930495fe53563dbdf3c9168f1511504813d22d6de74b2ed4c9d487 cmake-3.31.6-windows-arm64.msi
fa648fd417f44e6cb08928964a480ade0d18df421f9b623639dba22f9b301e4e cmake-3.31.6-windows-arm64.zip
279b703cec818e6c6fe8955f35e3e41fb373764491b2ed6ef14786ae9d4dc511 cmake-3.31.6-windows-i386.msi
005ef676975aa0f8348fc2c8011a913f9676f07f602ca624ee0811b427d3fd84 cmake-3.31.6-windows-i386.zip
4cc39d59426cbbeb33d0daff1350e39b0585a90e3c9883dbba70816b8d282811 cmake-3.31.6-windows-x86_64.msi
d163cd3ab4959b0a53fa8988f2ddbd2e6c501658201e6a154386bad9dbe4f836 cmake-3.31.6-windows-x86_64.zip
653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0 cmake-3.31.6.tar.gz
106df3d82f20aaa52a5f575c836effc5713a2fe3235f38e9be5c8a14b8d35530 cmake-3.31.6.zip

View File

@@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAme8nAgACgkQLSzvEDSS
FoQvWxAAmKC6E9lwPY0rq17M7MchJhA+q+9djVs6yjADWGrCeIG+ej5AYUzbf3nB
2PDol5xDwpw5oZ35oZb7hgtsxdnGA5Uv487tyfKWw9jlCTn1EBXhAgu23nwxKWLw
8st63tfotpNdvICdEn3Uib30JORrMWRTjbj19mG81+G9yt7rrM/f5LVuLQvGFsP6
+U0qr61PYpGWwu4nab0dPHiJr0mfczf9q1+ApPq9tNLF5Vx6ngopa63Vih/Tt7ts
Jd042j+eCbumvB/1rhaNH6GkVr1qIej9Oq0LVR2FJMMNbcE2XcD5Is3sq8sN5980
LCY4SQggBFwG9qXeqY4iOupSf9kvzIhWOw3elvYgTKZtbkqPgS27LcW3tT6AdTUk
+clN8h7qgO70eQMba5PCwOYcImEKqZOBHtMG5zvqaZlhmwvZth5JzMCWJ1617MEJ
2+wHfX9cicTb5Z3yM+L1Q2Wo6nzU8s8/oaJuCYz/MZ2pN2H8dBVGddzEzf7/Cg2q
vW+6FGBlsCTzA9vj97KGgtM6w9NoDMdHozlgwwLqAn1JTajbB6f/HA1Jp/jgjfHN
MlWDYCGyoyW8F1TUaPhsswRoo61Fm469UID1Y04UXd3VKQ4UNMPBWDdLvbNg8xsm
EknA7wwnKgJpl+yEwRvYASR+MRvsb5FQiiqki8Xt9FjYazQ91zY=
=fUDw
-----END PGP SIGNATURE-----

BIN
cmake-3.31.6.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,38 @@
From a869b79c5921412c91fb71a761748ae5f7d3fb23 Mon Sep 17 00:00:00 2001
From: Atri Bhattacharya <badshah400@gmail.org>
Date: Mon, 10 Mar 2025 20:55:36 +0530
Subject: [PATCH] FindHDF5: Prefer h5hl* compilers for HDF5_FIND_HL
Prefer `h5hlcc`, `h5hlc++`, and `h5hlfc` compilers when HDF5's HL libraries
are requested. These include the `-lhdf_hl` in the command line, whereas
the non-hl compilers (like `h5cc`) do not. Using the latter, therefore,
leads to cmake complaining about not finding the `HDF5_HL` libraries even
though they are present in the same location as the `hdf5` library itself.
Fixes: #23261
---
Modules/FindHDF5.cmake | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 2f0c3c1665..89058ca2be 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -218,6 +218,13 @@ else()
set(HDF5_Fortran_COMPILER_NAMES h5fc h5pfc)
endif()
+# Prefer h5hl<LANG> compilers if HDF5_FIND_HL is enabled
+if(HDF5_FIND_HL)
+ list(PREPEND HDF5_C_COMPILER_NAMES h5hlcc)
+ list(PREPEND HDF5_CXX_COMPILER_NAMES h5hlc++)
+ list(PREPEND HDF5_Fortran_COMPILER_NAMES h5hlfc)
+endif()
+
# Test first if the current compilers automatically wrap HDF5
function(_HDF5_test_regular_compiler_C success version is_parallel)
if(NOT ${success} OR
--
GitLab

View File

@@ -1,3 +1,119 @@
-------------------------------------------------------------------
Tue Mar 11 06:54:19 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
- Add cmake-findhdf5-prefer-hl-compilers.patch -- FindHDF5: Prefer
h5hl* compilers for HDF5_FIND_HL; patch submitted upstream
[https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10450.patch].
This fixes hdf5_hl detection issues when building hdf5 >= 1.14
using cmake instead of autotools.
-------------------------------------------------------------------
Fri Feb 28 20:22:35 UTC 2025 - Dirk Müller <dmueller@suse.com>
- temporarily revert "make %cmake_{build, install} call cmake
directly" as the fall out is too large. will be restored once
fallout can be mitigated
-------------------------------------------------------------------
Tue Feb 25 06:17:14 UTC 2025 - Christoph G <foss@grueninger.de>
- update to 3.31.6
* cmGeneratorExpressionDAGChecker: Construct with initializer
list syntax, De-duplicate constructor signature, Construct
with initializer list syntax
* GenEx: Restore evaluation context for conditional transitive
properties, Fix evaluation of LINK_LIBRARIES as custom
transitive property
* GoogleTest: Restore support for spaces in explicit
WORKING_DIRECTORY
--------------------------------------------------------------------
Wed Feb 19 00:34:48 UTC 2025 - Yoong Jin <solomoncyj@gmail.com>
- make %cmake_{build, install} call cmake directly
to auto set generator so that %global
are no longer needed to set generators
-------------------------------------------------------------------
Tue Jan 14 14:33:12 UTC 2025 - Christoph G <foss@grueninger.de>
- update to 3.31.4
* LFortran: Remove hard-coded --generate-object-code flag
* FindBoost: Add support for Boost 1.87
-------------------------------------------------------------------
Sat Dec 21 12:51:12 UTC 2024 - Christoph G <foss@grueninger.de>
- update to 3.31.3
* cmLocalUnixMakefileGenerator3: Simplify progress command
generation
* Makefile: Fix per-directory codegen target
* Makefile: Enable progress messages for codegen target
* cmGlobalNinjaGenerator: Fixes and improvements
-------------------------------------------------------------------
Fri Dec 6 18:07:29 UTC 2024 - Christoph G <foss@grueninger.de>
- update to 3.31.2
* GNU linker: Use single-argument form of --dependency-file flag
* fileapi: Do not expose flags for linker-generated dependencies
* LINK_OPTIONS: Fix crash on empty LINKER: prefix
* FindRuby: Add support for 3.4
-------------------------------------------------------------------
Tue Nov 26 20:10:59 UTC 2024 - Christoph G <foss@grueninger.de>
- update to 3.31.1
* FindBoost: Add support for Boost 1.86
* libarchive: Update script to get 3.7.7
* execute_process: Restore CLOEXEC on OUTPUT_FILE and
ERROR_FILE descriptors
* LLD linker: avoid regression on archive libraries deduplication
-------------------------------------------------------------------
Thu Nov 7 17:56:10 UTC 2024 - Christoph G <foss@grueninger.de>
- update to 3.31.0
* cmake-presets(7) files may now include comments using the key
"$comment" at any level within the JSON object to provide
documentation.
* The Ninja Generators and Makefile Generators now produce a
"codegen" build target.
* The "CMAKE_LINK_LIBRARIES_STRATEGY" variable and corresponding
"LINK_LIBRARIES_STRATEGY" target property were added to
optionally specify the strategy CMake uses to generate link
lines.
* The "CMAKE_EXPORT_BUILD_DATABASE" variable, a corresponding
"CMAKE_EXPORT_BUILD_DATABASE" environment variable, and an
"EXPORT_BUILD_DATABASE" target property, were added to enable
exporting C++ module compile commands. This is only supported
with Ninja Generators.
* The "CMAKE_<LANG>_HOST_COMPILER_ID" and
"CMAKE_<LANG>_HOST_COMPILER_VERSION" variables were added,
where "<LANG>" is either "CUDA" or "HIP". They are populated
when "CMAKE_<LANG>_COMPILER_ID" is "NVIDIA" to identify NVCC's
host compiler.
* The "file(DOWNLOAD)" and "file(UPLOAD)" commands now verify TLS
server certificates for connections to "https://" URLs by
default.
-------------------------------------------------------------------
Wed Oct 23 08:36:43 UTC 2024 - Dirk Müller <dmueller@suse.com>
- update to 3.30.5:
* project: Only check non-cache vars when setting project vars
-------------------------------------------------------------------
Fri Sep 27 22:19:53 UTC 2024 - Christoph G <foss@grueninger.de>
- update to 3.30.4:
* FetchContent: Don't update verify script timestamp if it
doesn't change
* project: Only define non-cache vars if already defined
* librhash: aligned_alloc is not available with glibc < 2.16
* FindPython: ensure all ABI are searched by default
* FindMatlab: multiple fixes for MCR
-------------------------------------------------------------------
Fri Aug 30 05:02:09 UTC 2024 - Christoph G <foss@grueninger.de>

View File

@@ -1,7 +1,7 @@
#
# spec file for package cmake
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
#
# All modifications and additions to the file contributed by third parties
@@ -52,7 +52,7 @@
%define pyver 3
%endif
Name: cmake%{?psuffix}
Version: 3.30.3
Version: 3.31.6
Release: 0
Summary: Cross-platform make system
License: BSD-3-Clause
@@ -69,6 +69,8 @@ Source99: README.SUSE
Patch0: cmake-fix-ruby-test.patch
# Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice
Patch1: feature-suse-python-interp-search-order.patch
# PATCH-FIX-UPSTREAM cmake-findhdf5-prefer-hl-compilers.patch badshah400@gmail.com -- FindHDF5: Prefer h5hl* compilers for HDF5_FIND_HL; patch submitted upstream [https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10450.patch]
Patch2: cmake-findhdf5-prefer-hl-compilers.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: pkgconfig