Commit Graph

55272 Commits

Author SHA1 Message Date
Brad King 627c08e28b Tests: Teach RunCMake to ignore Xcode DVTSDK warnings
On some Xcode versions, `xcodebuild` may warn:

    ... xcodebuild[...]  [MT] DVTSDK: Warning: SDK path collision for path ...

Teach RunCMake to drop such incidental lines before matching against
expected output.
2022-06-10 14:24:03 -04:00
Brad King ab40020b17 Xcode: Suppress "Run Script" build phase warning during compiler id
warning: Run script build phase 'Run Script' will be run during every
    build because it does not specify any outputs.
2022-06-10 14:24:03 -04:00
Brad King 89e1113e0c Xcode: Use ad-hoc signing during compiler id on macOS
Xcode 14 no longer accepts an empty signing identity for macOS.
However, Xcode in general does not accept an ad-hoc signing
identity for iOS.  Switch based on the target platform.

Fixes: #23609
2022-06-10 14:22:40 -04:00
Brad King b243367b36 CMake 3.22.5 v3.22.5 2022-06-01 11:15:18 -04:00
Brad King a12cc91764 Merge branch 'release-3.21' into release-3.22 2022-06-01 10:45:23 -04:00
Brad King 97073b1991 CMake 3.21.7 v3.21.7 2022-06-01 09:53:26 -04:00
Brad King c26255665a Merge branch 'release-3.21' into release-3.22 2022-05-31 11:56:43 -04:00
Brad King 245edf39fc Merge branch 'release-3.20' into release-3.21 2022-05-31 11:56:27 -04:00
Brad King 5f6c4c86aa Merge branch 'cmake-gui-locale' into release-3.22
Merge-request: !7303
2022-05-27 12:02:11 -04:00
Brad King 7b3d228067 Merge branch 'cmake-gui-locale' into release-3.21
Merge-request: !7303
2022-05-27 12:02:01 -04:00
Brad King a539aed6bf Merge branch 'cmake-gui-locale' into release-3.20
Merge-request: !7303
2022-05-27 12:01:41 -04:00
Brad King ae13524e3b cmake-gui: Restore support for internationalization with Qt5 on Windows
Restore the logic removed by commit 035078d847 (cmake-gui: Remove
explicit locale setup, 2020-12-17, v3.20.0-rc1~205^2~6), but only with
Qt5 on Windows.  Leave a FIXME comment to support Qt6 later.

Fixes: #23562
Issue: #23565
2022-05-27 11:52:51 -04:00
Brad King d763ec0fdb Merge topic 'backport-update-libarchive' into release-3.22
e2fe1d17e6 libarchive: Update build within CMake after changes in 3.5.3
ac5e524763 libarchive: include archive_platform.h first in blake2s sources
b93d8b1714 Merge branch 'upstream-LibArchive' into update-libarchive
9fd16c5b5b LibArchive 2022-02-08 (673c1eae)
de38c89252 libarchive: Update script to get 3.5.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7294
2022-05-24 13:35:06 -04:00
Brad King e2fe1d17e6 libarchive: Update build within CMake after changes in 3.5.3 2022-05-24 12:35:53 -04:00
Brad King ac5e524763 libarchive: include archive_platform.h first in blake2s sources
This is the libarchive convention in all other `.c` sources.  It ensures
that the configured `_WIN32_WINNT` value is defined before including any
system headers.
2022-05-24 12:35:26 -04:00
Brad King b93d8b1714 Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
  LibArchive 2022-02-08 (673c1eae)
2022-05-24 12:20:20 -04:00
LibArchive Upstream 9fd16c5b5b LibArchive 2022-02-08 (673c1eae)
Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit 673c1eae896c837081a627807b9d5e990684dbf7 (v3.5.3).
2022-05-24 12:18:12 -04:00
Brad King de38c89252 libarchive: Update script to get 3.5.3 2022-05-24 12:17:57 -04:00
Brad King a57652b0d6 Merge branch 'release-3.21' into release-3.22 2022-05-19 17:55:58 -04:00
Brad King 97ec556309 Merge branch 'vs2022-only' into release-3.22
Merge-request: !7282
2022-05-19 17:55:41 -04:00
Brad King f334235c19 Merge branch 'vs2022-only' into release-3.21
Merge-request: !7282
2022-05-19 17:55:04 -04:00
Brad King 235b5fb05b file(GET_RUNTIME_DEPENDENCIES): Support VS 2022 without VS 2019
Find MSVC tools in VS 2022 installation.
2022-05-19 17:50:06 -04:00
Brad King 4a9e2a1572 Merge branch 'FortranCInterface-gcc12' into release-3.22
Merge-request: !7266
2022-05-16 11:19:29 -04:00
Brad King cb616d43d6 FortranCInterface: Fix failure with gfortran 12 and Clang
The C flags added by commit 6a0ce19ce1 (FortranCInterface: Fix
compatibility with GCC gfortran 12 LTO, 2022-01-19, v3.22.2~5^2)
should only be added for the GNU C compiler.

Fixes: #23500
Issue: #23123
2022-05-16 11:18:00 -04:00
Brad King d478dda0eb Merge branch 'FindPkgConfig-LIBRARY_PATH' into release-3.22
Merge-request: !7258
2022-05-12 13:34:21 -04:00
Brad King 11c8da94d4 FindPkgConfig: Fix preservation of ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS}
Fix the ENV save/restore added by commit 36979f5b43 (FindPkgConfig:
Tolerate PKG_CONFIG_SYSTEM_LIBRARY_PATH in environment, 2021-07-13,
v3.22.0-rc1~407^2) to unset the variable if it was originally not set.

While at it, clarify the value to which we temporarily set it. The
`pkg-config` and `pkgconf` tools only check that the variable is set,
and do not care about the value.  Set it to a more true-looking value.

Issue: #22148
2022-05-12 13:18:24 -04:00
Brad King ad5bf708a6 Merge branch 'release-3.21' into release-3.22 2022-04-26 11:13:18 -04:00
Brad King f48047251f Merge branch 'ci-xcode-13.3' into release-3.22
Merge-request: !7204
2022-04-26 11:12:28 -04:00
Brad King adcb98c51b Merge branch 'ci-xcode-13.3' into release-3.21
Merge-request: !7204
2022-04-26 11:12:02 -04:00
Brad King 65b6daf776 gitlab-ci: update macOS jobs to use Xcode 13.3 2022-04-25 15:52:15 -04:00
Gregor Jasny 94361a1309 Tests: Ignore all classes in Xcode internal objc warnings
Xcode on Apple Silicon warns not only about AMSupportURL classes
but also many more.
2022-04-25 15:52:15 -04:00
Brad King da9f864513 Tests: Teach RunCMake to ignore Xcode extension point warnings
On some Xcode versions, `xcodebuild` may warn:

    ... xcodebuild[...] Requested but did not find extension point with
                        identifier ...

Teach RunCMake to drop such incidental lines before matching against
expected output.
2022-04-25 14:35:11 -04:00
Brad King 07d351b535 CMake 3.22.4 v3.22.4 2022-04-12 09:06:27 -04:00
Brad King 5ac0c541b4 Merge branch 'xcode-pch' into release-3.22
Merge-request: !7166
2022-04-12 08:11:58 -04:00
Cristian Adam 476c6a8910 PCH: Fix Xcode non-pch language exclusion
Fix a regression caused by commit bbcdac4e5d (PCH: Fix all-language
precompile header support in Xcode, 2021-08-07, v3.22.0-rc1~140^2).

Fixes: #23138
2022-04-11 14:16:33 -04:00
Gregor Jasny fcf1fcfd0c Tests: Ignore all classes in Xcode internal objc warnings
Xcode on Apple Silicon warns not only about AMSupportURL classes
but also many more.
2022-04-11 14:15:52 -04:00
Brad King 8242631e63 Merge branch 'doc-qhelpgenerator' into release-3.22
Merge-request: !7150
2022-04-07 10:03:59 -04:00
Brad King bf69fa32c4 Utilities/Sphinx: Update qthelp generation to qhelpgenerator
`qcollectiongenerator` is deprecated in favor of `qhelpgenerator`.
2022-04-07 09:37:37 -04:00
Brad King 37904abb58 Help: Add "Updates" section header in 3.22 release notes
This was accidentally left out in commit 1461eff899 (Help: Add missing
3.22.1 section to the release notes, 2022-01-24, v3.22.2~1^2).
2022-04-07 09:33:03 -04:00
Brad King 8070ff36cb Merge branch 'ci-cmake.org-help' into release-3.22
Merge-request: !7146
2022-04-06 12:55:28 -04:00
Brad King b691906d27 gitlab-ci: Build qthelp-format release documentation for cmake.org
Previously the qthelp-format release documentation on `cmake.org` was
built manually.
2022-04-06 09:59:14 -04:00
Brad King 1ceec19c20 gitlab-ci: Add objects.inv to cmake.org html documentation 2022-04-06 09:24:48 -04:00
Brad King 1ee80fc752 Merge branch 'ci-cmake.org-help' into release-3.22
Merge-request: !7144
2022-04-05 17:47:26 -04:00
Brad King 2808281730 gitlab-ci: update cmake.org documentation in release package pipeline 2022-04-05 16:09:55 -04:00
Brad King ed00a29cce gitlab-ci: consolidate jobs for cmake.org/cmake/help/git-{master,stage} docs 2022-04-05 16:09:55 -04:00
Brad King 5c2e8ce515 Utilities/Sphinx: Add OpenSearch link to html page headers on cmake.org
Reference an OpenSearch description file that sits outside the content
of any specific version so we only need to maintain one and so that
it can reference the latest version.

This was previously added in a custom branch for building the
cmake.org reference documentation.
2022-04-05 16:09:54 -04:00
Brad King a14905d4df Utilities/Sphinx: Add option to build outdated version banner for cmake.org
This was previously added in a custom branch for building the
cmake.org reference documentation.
2022-04-05 16:09:54 -04:00
Brad King cca73b54ae Utilities/Sphinx: Add undocumented option to build docs for cmake.org 2022-04-05 16:09:54 -04:00
Brad King fa136ae380 Merge branch 'ci-release-manual' into release-3.22
Merge-request: !7143
2022-04-05 15:16:55 -04:00
Brad King eb410615f2 gitlab-ci: start release package pipelines manually
A release pipeline is always created by manual execution of a pipeline
schedule.  Require the initial pipeline jobs to be started manually too
so that we can later add separate components to play separately.
2022-04-05 15:00:17 -04:00