diff --git a/cmake-3.21.4-SHA-256.txt b/cmake-3.21.4-SHA-256.txt deleted file mode 100644 index 11a9a10..0000000 --- a/cmake-3.21.4-SHA-256.txt +++ /dev/null @@ -1,15 +0,0 @@ -de3841c8da3869e8ed6ec466afbfb1faedefec756d9fb94bc95ddcbcc6e15860 cmake-3.21.4-files-v1.json -8bd4e245878232ea8ec3f73be06c80305e8b362ba677a4bc5086311f391496eb cmake-3.21.4-linux-aarch64.sh -abe24e2e6ae8a706e771a612603ec93457dc6b71bdb09e35d2a26f051e2fa818 cmake-3.21.4-linux-aarch64.tar.gz -63cb3406f5320edc94504212fe75e8625751ec21e8d5dab76d8ed67ed780066e cmake-3.21.4-linux-x86_64.sh -eddba9da5b60e0b5ec5cbb1a65e504d776e247573204df14f6d004da9bc611f9 cmake-3.21.4-linux-x86_64.tar.gz -209e8c3048b6855d78dab1e1691309f377ba859a757e5f7b508fd7a3ff0afafa cmake-3.21.4-macos-universal.dmg -f818a10fe625b215e31d0c29c19a6563fb5f51ed7cc7727e5011626c11ea321a cmake-3.21.4-macos-universal.tar.gz -eee8769a9db81d137b9d30debb751700f646c51f02ca16b05843a5f777f653f5 cmake-3.21.4-macos10.10-universal.dmg -2fe979147896cde7aa8a28ee9f58652487928f4ed50e3b1e48b57bd08fa480fe cmake-3.21.4-macos10.10-universal.tar.gz -c769ece7ec8e91529f4cc938f088b4699a1f5cd39b7f44158d1aa0ab6e76ab74 cmake-3.21.4-windows-i386.msi -970d38453abd7c5953415b8ea8c1f66f88a2bd2548feabc5e4b6f1b8c4acdcae cmake-3.21.4-windows-i386.zip -13a18f293a09f65658913003ee719b29fd7e82937dbf61bf1f96ed5d139c8c6d cmake-3.21.4-windows-x86_64.msi -360ee9bf77cd891d4a33997e4e214d0cd6a0fd7ae6051d023f403a74248914a8 cmake-3.21.4-windows-x86_64.zip -d9570a95c215f4c9886dd0f0564ca4ef8d18c30750f157238ea12669c2985978 cmake-3.21.4.tar.gz -a57f6f08de47229fe51fd5ef4a20001eed4294923768f58aa21424a478076988 cmake-3.21.4.zip diff --git a/cmake-3.21.4-SHA-256.txt.asc b/cmake-3.21.4-SHA-256.txt.asc deleted file mode 100644 index 20cf87f..0000000 --- a/cmake-3.21.4-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmF5ZOwACgkQLSzvEDSS -FoQ2FQ/+LLFVHIOPQqbxLGBCZ5BsFBag6kONmxYGWhQVQglN7VXtvBBDFBs91qV8 -YucSvSdgiqKrbQAJcE9UQPmFcGYlvqlh56BcgO1RuWIYSH/ldJNcq2JDguaMKi9k -tbatVPKwIYxy6X/QMh+mglqpJrebyHZYn2hdY7aFm/xsvYcw7a6ezcD+c83/tuvR -DK72oIejzMtFGHnX1DkrZ9tMG7noFpV5Q6PbdoB/UpE32WRt6VoPwXiva93iQD6S -v9P9HU6Xkyly52RkWoFC2qqnFFLCtK/zXg4w6LyRC7urxIzPH5zmZM7t1C7vtXO+ -40Ed1Ot/Qlw0twoMNMuiRAoXgKHx8yG8tnOnXc1SURzBJ5gK8Do0XJw9DO/vagON -7G0LgnuNBvQ89B+hxt4RoKuTdRduA142ESbs6Qb6FXgA3h07Ad5zkhLRl73hBGMc -/NBx2FkXr1BapbV3uCJxmac1yPcEYpSTHc1d1M9YYiPvINDRO78aXV26StYyJSiK -Fsi49q6+dXbg+8hgILtc8HgVZ00vuahXUywoc2YKWC1UXc83I8rfBaeS6hoMh3UA -0h6wkIEe37ud8t1NTfFGanD5BRISl2z/ucanq66putWt46Fdh0fSabK7RSoq67Xb -bzC+3AzM+3X3VmtS2r1kou8YkZ+xcwqRmTYSaIgjhcGJGZI/www= -=ie1d ------END PGP SIGNATURE----- diff --git a/cmake-3.21.4.tar.gz b/cmake-3.21.4.tar.gz deleted file mode 100644 index 2ceaae0..0000000 --- a/cmake-3.21.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9570a95c215f4c9886dd0f0564ca4ef8d18c30750f157238ea12669c2985978 -size 9630991 diff --git a/cmake-3.22.1-SHA-256.txt b/cmake-3.22.1-SHA-256.txt new file mode 100644 index 0000000..e2c5cfa --- /dev/null +++ b/cmake-3.22.1-SHA-256.txt @@ -0,0 +1,15 @@ +b14fe1625ee437975d308a5464fe69fc0b27c66fd01394c331b6342a0c5e48b9 cmake-3.22.1-files-v1.json +ff886c6c16be867229a6c1fe4bc963ff77ae24187d5a8d64ef72a06f84c1a25c cmake-3.22.1-linux-aarch64.sh +601443375aa1a48a1a076bda7e3cca73af88400463e166fffc3e1da3ce03540b cmake-3.22.1-linux-aarch64.tar.gz +808a712bcb039fd71f6960dca82a9befb977d8bdb074718218cf7646fd08bb7a cmake-3.22.1-linux-x86_64.sh +73565c72355c6652e9db149249af36bcab44d9d478c5546fd926e69ad6b43640 cmake-3.22.1-linux-x86_64.tar.gz +6339c0db2317c07df55097777aa18d782e4978801b3c7423645135babe396f0c cmake-3.22.1-macos-universal.dmg +9ba46ce69d524f5bcdf98076a6b01f727604fb31cf9005ec03dea1cf16da9514 cmake-3.22.1-macos-universal.tar.gz +71d8174e9c2194b958cd300fefecb05ac1e0a8aa7bdd0925476fb0c7cd5ead29 cmake-3.22.1-macos10.10-universal.dmg +035f871a183c503b0e599042da279be3dabafbf492e86ca4a196c80a5f870d1f cmake-3.22.1-macos10.10-universal.tar.gz +2763217d5424f44569d36bb1fece916f16c1a5ceee9b7e8d332e0498da8753ab cmake-3.22.1-windows-i386.msi +f53494e3b35e5a1177ad55c28763eb5bb45772c1d80778c0f96c45ce4376b6e8 cmake-3.22.1-windows-i386.zip +540c05114224d64392046f72e3fa63673fd6d51b2fd49735ff4994ae177b8e08 cmake-3.22.1-windows-x86_64.msi +35fbbb7d9ffa491834bbc79cdfefc6c360088a3c9bf55c29d111a5afa04cdca3 cmake-3.22.1-windows-x86_64.zip +0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0 cmake-3.22.1.tar.gz +cbaafd2c06be8851bb5310f279354fea8ba73f577a5cf3afbddad989d2a3125c cmake-3.22.1.zip diff --git a/cmake-3.22.1-SHA-256.txt.asc b/cmake-3.22.1-SHA-256.txt.asc new file mode 100644 index 0000000..96def2d --- /dev/null +++ b/cmake-3.22.1-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmGvk6YACgkQLSzvEDSS +FoQX0Q/+NzkUrlG7vIDqHZGoXPep+jDudFqFoEKJx00YfSicYoJF87s+herDIvIh +74MsbUldKxwP1UvQ9wxIgQJnCid+hZLSHCqiBSo9aI6NqZk8yGEq9qn1XCBky8O9 +bj8MAI/7he1KCVjftWSxE20C8PpQ0z7JQWr0qBWPiJOmf1CUNmn7Dh6qa6IruxuF +fTyIPt2mqaDayafYQMDaUPFr44HNE5mftVIYyaJa20nBmODAMIrQ6E7qJa+XlKAA +tm1EdFYJpLHZx1FwTLs0/DNuro6xs1emAiaNGU48jhlYdNIvmClexo6wj7r4Jepc +/Jz4L53c1KVbtCIt4cFcxzUcF1dTlNnulQ62wZI1fA8TqHP/aRrYzOzJjyi7yxJN +IhDbXGt0QdoxrsW0BpvuGhy6tMV8Tv3tvFoblWatGd0+Wktl4YhgKMtZsMgYL9KV +XmmRPJ5J+YgaWgUq1Fcl9pUo1FAJnP3rKpk9QgyZ0VBgyulDbbOVNm7p8RIoYkDG +kja76KLNdCwam5227vzO6nS83Z+aIIUBdU5kWqhz+DnELjmmlQ+jUS4OAA+2WGkx +ixHy4eWTR2cPc9lVoXhKbH4rRsPKQjB4qPNWmcTIMK+mSzxUnpSnFY6574gW1OpN +colTih+4lvQbaV+moeXZWZdTv0976dBaWrYN6LmxhrxLItR7Yag= +=cFSS +-----END PGP SIGNATURE----- diff --git a/cmake-3.22.1.tar.gz b/cmake-3.22.1.tar.gz new file mode 100644 index 0000000..551ea91 --- /dev/null +++ b/cmake-3.22.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0 +size 9778031 diff --git a/cmake.changes b/cmake.changes index 156a555..6c676a2 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,60 @@ +------------------------------------------------------------------- +Sat Dec 11 10:27:53 UTC 2021 - Andreas Stieger + +- cmake 3.22.1: + * try_compile: Do not use CMAKE_BUILD_TYPE or + CMAKE_CONFIGURATION_TYPES + * file(RPATH): Restore tolerance of unknown formats if new RPATH + is empty + * CMakeParseLibraryArchitecture: Fix parsing /lib/ implicit + object path + +------------------------------------------------------------------- +Wed Dec 1 16:36:36 UTC 2021 - Christophe Giboudeaux + +- Adapt cmake.prov for Qt >= 6.2.2 + Upstream uses its own ConfigVersion implementation.Starting with + Qt 6.2.2, 'PACKAGE_VERSION' is not defined in + Qt6FooConfigVersion.cmake but in Qt6FooConfigVersionImpl.cmake. + +------------------------------------------------------------------- +Thu Nov 18 20:25:16 UTC 2021 - Andreas Stieger + +- cmake 3.22.0: + * The cmake_host_system_information() command can now query OS + identification variables from the /etc/os-release file. + * The string(TIMESTAMP) command now supports the %V specifier for + ISO 8601 week numbers. + * New variables: + CMAKE_BUILD_TYPE + CMAKE_CONFIGURATION_TYPES + CMAKE_INSTALL_MODE + CMAKE__LINK_WHAT_YOU_USE_FLAG, CMAKE_LINK_WHAT_YOU_USE_CHECK + CMAKE_REQUIRE_FIND_PACKAGE_ + * The _EXTENSIONS target property is now initialized to + CMAKE__EXTENSIONS_DEFAULT, detected from the compiler. + * VS_SETTINGS source file property is now supported for all source file types + * The CMakeDependentOption module cmake_dependent_option() macro + now supports full Condition Syntax127. + * The FetchContent module now passes through the CMAKE_TLS_VERIFY, + CMAKE_TLS_CAINFO, CMAKE_NETRC and CMAKE_NETRC_FILE variables + (when defined) to the underlying ExternalProject sub-build. + * The FindBLAS and FindLAPACK modules gained a BLA_SIZEOF_INTEGER + option to find a BLAS/LAPACK whose ABI uses a specific integer size. + * The FindJasper module now provides an imported target. + * The FindMatlab module now provides imported targets. + * The FindPkgConfig module gained a PKG_CONFIG_ARGN variable to + specify arguments to pkg-config calls. + * The GoogleTest module gtest_discover_tests() function gained a + TEST_FILTER option to filter tests using --gtest_filter during + test discovery. + * The UseSWIG module, for Visual Studio Generators, can now use the + swig tool to generate implicit dependencies. + * ctest improvements + * CPack DEB Generator supports zstd + * CPack RPM Generator gained support to exluding paths from + dependency scanning + ------------------------------------------------------------------- Sun Oct 31 11:07:05 UTC 2021 - Andreas Stieger diff --git a/cmake.prov b/cmake.prov index 2b0d692..e1d5530 100644 --- a/cmake.prov +++ b/cmake.prov @@ -57,11 +57,16 @@ class CMakeParser: return result def resolveCMakeModuleVersion(self, modulePath, cmakeModule, lowercase): - versionFile = ("%s/%s-config-version.cmake" if lowercase else "%s/%sConfigVersion.cmake") % (modulePath, cmakeModule) + # Qt >= 6.2.2 defines 'PACKAGE_VERSION' in *ConfigVersionImpl.cmake + versionFile = f"{modulePath}/{cmakeModule}ConfigVersionImpl.cmake" if "Qt6" in f"{cmakeModule}" else "" try: f = open(versionFile, 'r') except: - return None + versionFile = ("%s/%s-config-version.cmake" if lowercase else "%s/%sConfigVersion.cmake") % (modulePath, cmakeModule) + try: + f = open(versionFile, 'r') + except: + return None for line in f: line = line.strip() diff --git a/cmake.spec b/cmake.spec index 29dc6f1..4036043 100644 --- a/cmake.spec +++ b/cmake.spec @@ -35,9 +35,9 @@ %else %bcond_with full %endif -%define shortversion 3.21 +%define shortversion 3.22 Name: cmake%{?psuffix} -Version: 3.21.4 +Version: 3.22.1 Release: 0 Summary: Cross-platform make system License: BSD-3-Clause