forked from pool/cmake
Accepting request 891390 from devel:tools:building
- update to 3.20.2:
* The Intel Classic 2021 compiler version numbers are now detected correctly as
having major version 2021. CMake 3.20.1 and below were not aware of a change to
the identification macro version scheme made by Intel starting in version 2021,
and detected the version as 20.2.
* The Intel oneAPI Fortran compiler is now identified as IntelLLVM. The oneAPI
2021.1 Fortran compiler is missing an identification macro, so CMake 3.20.1 and
below identified it as Intel. CMake now has a special case to recognize oneAPI
2021.1 Fortran as IntelLLVM. The oneAPI 2021.2 Fortran compiler defines the
proper identification macro and so is identified as IntelLLVM by all CMake 3.20
versions.
- drop 53d523f2e11839bcbbdc9288b4f71c764d0efd5c.diff (merged upstream)
OBS-URL: https://build.opensuse.org/request/show/891390
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=194
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
f89cdb093f
@ -1,47 +0,0 @@
|
||||
diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx
|
||||
index 535f786f41487e57fd3e9d547d22344b18b924a1..f5831628d3fe3c05b0bf4447036e5ac6bcdbdafc 100644
|
||||
--- a/Source/cmQtAutoMocUic.cxx
|
||||
+++ b/Source/cmQtAutoMocUic.cxx
|
||||
@@ -564,8 +564,7 @@ private:
|
||||
// -- Generation
|
||||
bool CreateDirectories();
|
||||
// -- Support for depfiles
|
||||
- static std::vector<std::string> dependenciesFromDepFile(
|
||||
- const char* filePath);
|
||||
+ std::vector<std::string> dependenciesFromDepFile(const char* filePath);
|
||||
|
||||
// -- Settings
|
||||
BaseSettingsT BaseConst_;
|
||||
@@ -2066,7 +2065,8 @@ void cmQtAutoMocUicT::JobCompileMocT::Process()
|
||||
" does not exist.");
|
||||
return;
|
||||
}
|
||||
- this->CacheEntry->Moc.Depends = dependenciesFromDepFile(depfile.c_str());
|
||||
+ this->CacheEntry->Moc.Depends =
|
||||
+ this->Gen()->dependenciesFromDepFile(depfile.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2223,12 +2223,12 @@ void cmQtAutoMocUicT::JobDepFilesMergeT::Process()
|
||||
this->MessagePath(this->BaseConst().DepFile.c_str())));
|
||||
}
|
||||
auto processDepFile =
|
||||
- [](const std::string& mocOutputFile) -> std::vector<std::string> {
|
||||
+ [this](const std::string& mocOutputFile) -> std::vector<std::string> {
|
||||
std::string f = mocOutputFile + ".d";
|
||||
if (!cmSystemTools::FileExists(f)) {
|
||||
return {};
|
||||
}
|
||||
- return dependenciesFromDepFile(f.c_str());
|
||||
+ return this->Gen()->dependenciesFromDepFile(f.c_str());
|
||||
};
|
||||
|
||||
std::vector<std::string> dependencies = this->initialDependencies();
|
||||
@@ -2961,6 +2961,7 @@ bool cmQtAutoMocUicT::CreateDirectories()
|
||||
std::vector<std::string> cmQtAutoMocUicT::dependenciesFromDepFile(
|
||||
const char* filePath)
|
||||
{
|
||||
+ std::lock_guard<std::mutex> guard(this->CMakeLibMutex_);
|
||||
auto const content = cmReadGccDepfile(filePath);
|
||||
if (!content || content->empty()) {
|
||||
return {};
|
||||
@ -1,15 +0,0 @@
|
||||
f8fe477a9c5144ce02fddd7ac0176a59ec2eba7a332b567ffcd069ac0f545b69 cmake-3.20.1-files-v1.json
|
||||
2761a222c14a15b9bdf1bdb4a17c10806757b7ed3bc26a84523f042ec212b76c cmake-3.20.1-linux-aarch64.sh
|
||||
5ad1f8139498a1956df369c401658ec787f63c8cb4e9759f2edaa51626a86512 cmake-3.20.1-linux-aarch64.tar.gz
|
||||
d25a8e8b76c137ffd55fa28b7a803309a2c6992e30fa0f1cb2172d5b970106e2 cmake-3.20.1-linux-x86_64.sh
|
||||
b8c141bd7a6d335600ab0a8a35e75af79f95b837f736456b5532f4d717f20a09 cmake-3.20.1-linux-x86_64.tar.gz
|
||||
6ace6bdf340f2e63b09ee3e4c03bfd93a6737b04d6d0eb94d5af1fd10f5b5839 cmake-3.20.1-macos-universal.dmg
|
||||
44143d47fdcc7fc3042576c6a8b661e3b65a18143666f74d6e8d93ca3ab5cd95 cmake-3.20.1-macos-universal.tar.gz
|
||||
8bdcc31d18b8b61b6032f364e960e75d61ec05fe51dd809d42e5f34dcd537258 cmake-3.20.1-macos10.10-universal.dmg
|
||||
89afcb79f58bb1f0bb840047c146c3fac8051829b6025c3dbe9b75799b27deb4 cmake-3.20.1-macos10.10-universal.tar.gz
|
||||
5d8514868d12c209f6b4533f47d20cfed0e871e4ee648fb36244504ca00aba0a cmake-3.20.1-windows-i386.msi
|
||||
650026534e66dabe0ed6be3422e86fabce5fa86d43927171ea8b8dfd0877fc9d cmake-3.20.1-windows-i386.zip
|
||||
a2eb2811aada9f4830281aa407231b9295dcac4b18bdbefc35d9dd71775110e8 cmake-3.20.1-windows-x86_64.msi
|
||||
9ed05401722f60e006420f5974c164795b321f0d8d8e7f2c0ed1180b5382201b cmake-3.20.1-windows-x86_64.zip
|
||||
3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0 cmake-3.20.1.tar.gz
|
||||
cd7c575daea51c504a30340d42e03a4f2b29390d583a153b4285777f7ac85552 cmake-3.20.1.zip
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmBu/FMACgkQLSzvEDSS
|
||||
FoSFphAAhf1BdSwCHE9HeEzQ9k69/XlOL74SxiFSk4bsIp/CohYRCfX6LJqx7dZT
|
||||
9JibBid2nx932DQatb3h60rTtrki4CpK2YulSPg7/3vkx894eYLfP0E/o35g55GH
|
||||
Pzw+Q9tU4FUPrbLbxD4ocVbtmKErPOyxr3hXL3HDkAhKJcyguLZRoBXizKPNymXI
|
||||
hNaZuzT1FCaPLWjUNWDdJP9zbVeIhtkQjIf5Hh0T6spMaJ5X5twgWSYP0xnhTD5B
|
||||
Ehf5EVczY6r4VYSWnGeFZxRCNSv5pMqDlLVk0m7bKnY7RfYEYrowqXqeoQ2hTfOB
|
||||
GHPTJYw8w7ucN7+MsBs74B85C7URcm+rBCSba3NrXjkIoL3dzyF5aZAbGEXIJj2d
|
||||
NECRQ2/YYHVyfM6wcYpCCEMIp49YjZqn1PyRlxgOvae+wcwaCd7Xn5lP/C81+JkQ
|
||||
oCdWbifxA8Wklvf68tx6K9RJaZ07DdMbUVTW8pKUyN9reBh56RwzqMSC4zZAnzR4
|
||||
WGwcrumhpfR6/G7E35b0ZAwBaqSW+h8SCG+KnV5mioY5RrUunZriNHtDW+YsMQBl
|
||||
ML/A+0bMJ3McjDlmkH4YUl0dJZiEy8iO4lw9rIP06svqGv4CnopmGBLoGyGixsEY
|
||||
sF77WpwcrH8wNDLhkLOncKVy8LF6jq6xlm1hnX1GG50Cy91SWvU=
|
||||
=wckc
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0
|
||||
size 9438789
|
||||
15
cmake-3.20.2-SHA-256.txt
Normal file
15
cmake-3.20.2-SHA-256.txt
Normal file
@ -0,0 +1,15 @@
|
||||
63f03cd954695505543f886027213cada422f37154084586da83eba40d9db6c6 cmake-3.20.2-files-v1.json
|
||||
dcd9d3758302d19eafc309d374a69a6703995ca19482e5b321f26f6c3bd04490 cmake-3.20.2-linux-aarch64.sh
|
||||
688a3ece018384966fed99a706bc8fbbbc50220393dce1531af36e640c46f601 cmake-3.20.2-linux-aarch64.tar.gz
|
||||
ea497b4658816010e5850a3ed53845e430654640aabbe10d93fe67def9503e4d cmake-3.20.2-linux-x86_64.sh
|
||||
3f827544f9c82e74ddf5016461fdfcfea4ede58a26f82612f473bf6bfad8bfc2 cmake-3.20.2-linux-x86_64.tar.gz
|
||||
988f7648dc1df20af59df1b545bfa35059b94eb62aa5c63fdfaedc10bc62f5e4 cmake-3.20.2-macos-universal.dmg
|
||||
0100663380a3bd977b001183cd487412db7aad9de6859927bde97e1e6e44e645 cmake-3.20.2-macos-universal.tar.gz
|
||||
bbc8d8837b3a96f1e2fefb21672f22ba051041d2820a3b6e8fbcb078f79292c0 cmake-3.20.2-macos10.10-universal.dmg
|
||||
6d9c1c1aecb61d085b1a20503fa94b0c28abae617e20189df61eea4cf876fba0 cmake-3.20.2-macos10.10-universal.tar.gz
|
||||
63ca554d2cef88eccaa21c435c7be7da4b68676e8739f51dbb657c40996cef20 cmake-3.20.2-windows-i386.msi
|
||||
8ad1f1f9a1a0a0dc82107eb9a4351d91d4e72504b0343368f1569b72a5e48bc1 cmake-3.20.2-windows-i386.zip
|
||||
552b5d165e568b571bb804fed9b9b9794bf7c515c03c266641c4ed29500d84c2 cmake-3.20.2-windows-x86_64.msi
|
||||
15a49e2ab81c1822d75b1b1a92f7863f58e31f6d6aac1c4103eef2b071be3112 cmake-3.20.2-windows-x86_64.zip
|
||||
aecf6ecb975179eb3bb6a4a50cae192d41e92b9372b02300f9e8f1d5f559544e cmake-3.20.2.tar.gz
|
||||
70c6fcb80adfc7aa2969c7b1fd020381ea528d06f3c2aab546f4c2407ed5d148 cmake-3.20.2.zip
|
||||
16
cmake-3.20.2-SHA-256.txt.asc
Normal file
16
cmake-3.20.2-SHA-256.txt.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmCKx9MACgkQLSzvEDSS
|
||||
FoQRFg//XU+prnNnHcqipKbvfTUSnbV3LtG8XlGXY3Ojk1yHsN7bqbJQxZwAiTcC
|
||||
ZoWoD4EzXIq6XzkdTsDe1n/dV0rvcwDPanZbprUfaAXRbM++nFMdTs/jyTckeJB/
|
||||
cbIuW1dttUzZPF5mEBSTlyzKiPIExZG4RmiGrDM0bdhCwDp0JZya4PHVR8iLiFrA
|
||||
xqPoLT/bdWZIX4hXc8ztWnWsMs8lgoAt1+UW9F1VnQcVsPjN+0OpE47PwpSe8bhV
|
||||
2hxBZ4hrHYexoDFZnrEzEaUngZZ2JLM2Fp7WkTKhuJHUn/In0pfL7DWWE3iAEYxV
|
||||
2fypqXVsz/A+KrW5CZ/cI1xHl6nNt8sh5lptmi5PArGcTcbcp8ZB9CLWYWu1/I1n
|
||||
n/2QlQIeXp+bxLqPEWa515UMty63UKFzGGv2el2S/lSeSpsE/w4JzqD6x/0vqJP/
|
||||
fCaSLYNm7LNokM+NyzyAkA18tbQ5h1TTHCUxF5sVT+4QKFh1SAKn6yL1nhxtqM6S
|
||||
4+PwmBi0xpZ9enLwLnX/Leq8PHziXdsimQ3cASmbrCMKoeNeeYbZm+ffV3IQ3tFn
|
||||
6VLbeu4vMXiMhz2PFONgYPrn3LyFKTUwmexdvPzvenLQkoxKYjwWxirzcmxw2c3D
|
||||
jo8B77cZV02T1b7Ts1c1LDStV3Q71iU7Tdz0bNTiT3fVlyvNS80=
|
||||
=68dg
|
||||
-----END PGP SIGNATURE-----
|
||||
3
cmake-3.20.2.tar.gz
Normal file
3
cmake-3.20.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:aecf6ecb975179eb3bb6a4a50cae192d41e92b9372b02300f9e8f1d5f559544e
|
||||
size 9438694
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 7 20:34:26 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- update to 3.20.2:
|
||||
* The Intel Classic 2021 compiler version numbers are now detected correctly as
|
||||
having major version 2021. CMake 3.20.1 and below were not aware of a change to
|
||||
the identification macro version scheme made by Intel starting in version 2021,
|
||||
and detected the version as 20.2.
|
||||
* The Intel oneAPI Fortran compiler is now identified as IntelLLVM. The oneAPI
|
||||
2021.1 Fortran compiler is missing an identification macro, so CMake 3.20.1 and
|
||||
below identified it as Intel. CMake now has a special case to recognize oneAPI
|
||||
2021.1 Fortran as IntelLLVM. The oneAPI 2021.2 Fortran compiler defines the
|
||||
proper identification macro and so is identified as IntelLLVM by all CMake 3.20
|
||||
versions.
|
||||
- drop 53d523f2e11839bcbbdc9288b4f71c764d0efd5c.diff (merged upstream)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 29 07:33:25 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
%endif
|
||||
%define shortversion 3.20
|
||||
Name: cmake%{?psuffix}
|
||||
Version: 3.20.1
|
||||
Version: 3.20.2
|
||||
Release: 0
|
||||
Summary: Cross-platform make system
|
||||
License: BSD-3-Clause
|
||||
@ -55,8 +55,6 @@ 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
|
||||
Patch2: cmake-fix-png-include-dir.patch
|
||||
# From https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6008
|
||||
Patch3: 53d523f2e11839bcbbdc9288b4f71c764d0efd5c.diff
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkgconfig
|
||||
|
||||
Loading…
Reference in New Issue
Block a user