Commit Graph

55249 Commits

Author SHA1 Message Date
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
Brad King
3a90800a9c gitlab-ci: simplify package pipeline job conditions
Use the job stage to distinguish upload jobs instead of an
explicit variable.
2022-04-05 15:00:17 -04:00
Brad King
9a1b301c85 gitlab-ci: add sanity check to upload jobs
Ensure that the upload destination is not empty.
2022-04-05 15:00:17 -04:00
Brad King
95888cde01 Merge branch 'backport-3.22-ci-package-uploads' into release-3.22
Merge-request: !7142
2022-04-04 13:39:31 -04:00
Brad King
cb44e0d47c gitlab-ci: distinguish release and development pipeline schedules
Redefine the `CMAKE_CI_PACKAGE` pipeline schedule variable to
indicate whether it is for a development version (`dev`) or a
release version (`v[0-9]...`).  Use this to automatically turn
package upload jobs on or off without having to edit the jobs
in `.gitlab-ci.yml` for release branches.
2022-04-04 13:23:37 -04:00
Brad King
3a9a9a3ace gitlab-ci: clarify name of package upload job template
The template is used to upload both source and binary packages.
2022-04-04 13:23:35 -04:00
Brad King
345a7e3ee4 Merge branch 'release-3.21' into release-3.22 2022-03-26 08:36:34 -04:00
Brad King
0906a9b53d Merge branch 'aix-exe-exports' into release-3.22
Merge-request: !7120
2022-03-26 08:36:31 -04:00
Brad King
024204fe0d Merge branch 'aix-exe-exports' into release-3.21
Merge-request: !7120
2022-03-26 08:36:17 -04:00
Brad King
a8dae21ac1 AIX: Fix executable ENABLE_EXPORTS in Makefile generators
In commit afcd9fe669 (AIX: Add an option to disable automatic exports
from shared libraries, 2020-01-30, v3.17.0-rc1~47^2) the population of
the `<AIX_EXPORTS>` rule variable placeholder was accidentally added to
the device linking rule rather than the main linking rule.  This caused
our `ExportImportList` script on AIX, when called for executables with
`ENABLE_EXPORTS` set, to be given an `AIX_EXPORTS` file name that does
not exist, leading to a warning from the `dump` tool.

Move the population of the `<AIX_EXPORTS>` placeholder in the Makefile
generators to the main link rule.

Issue: #20290
2022-03-26 08:28:59 -04:00
Brad King
01a4be3c60 Merge branch 'cpack-nsis-fix-uninstall-quoting' into release-3.22
Merge-request: !7096
2022-03-21 14:54:53 -04:00
Marc Jeanmougin
5d2ceaada8 CPack/NSIS: Add support for unquoted (legacy) uninstaller strings 2022-03-21 14:53:44 -04:00
Marc Jeanmougin
b795c96727 CPack/NSIS: Fix uninstall command when run from installer
The quoting introduced by commit eb3b3bacdc (CPack/NSIS: Fix uninstall
on Windows using "Apps & Features", 2021-09-13, v3.22.0-rc1~136^2)
created two errors in the uninstaller call: double quoting of the
uninstaller executable, and quotes added to the `_?=` argument which
does not support them.  Simplify the command.
2022-03-21 14:53:31 -04:00
Brad King
0abd49ebb9 Merge branch 'release-3.21' into release-3.22 2022-03-21 14:13:56 -04:00
Brad King
2b0f96ce56 Merge branch 'rel-win-docker' into release-3.22
Merge-request: !7087
2022-03-21 14:13:44 -04:00
Brad King
f71e89ae42 Merge branch 'rel-win-docker' into release-3.21
Merge-request: !7087
2022-03-21 14:13:31 -04:00
Brad King
a6aa88e51f Utilities/Release: Add "source" stage to Windows docker spec
Revise the spec added by commit ff929badb3 (Utilities/Release: Add
docker specs to build and test Windows binaries, 2020-05-05,
v3.18.0-rc1~203^2~1) to add a `source` stage that stops just after
copying the source tree into the image.  This provides more granular
control to driving scripts.
2022-03-18 09:50:55 -04:00
Brad King
c41978274e Merge branch 'FindPython-pypy-specify-versions' into release-3.22
Merge-request: !7081
2022-03-17 10:15:09 -04:00
Marc Chevrier
2834cea155 FindPython: fix various problems using pypy interpreters
* add more possible directories for include file search
* enhance version detection from library and include files
* search for file pypy_decl.h when PyPy.h is not defined
2022-03-17 14:53:40 +01:00
Brad King
4a4fa6ae54 Merge branch 'release-3.21' into release-3.22 2022-03-16 10:51:07 -04:00
Brad King
2db936e59a Merge branch 'binutils-llvm-ar-apple' into release-3.22
Merge-request: !7077
2022-03-16 10:51:03 -04:00
Brad King
12e03d7051 Merge branch 'binutils-llvm-ar-apple' into release-3.21
Merge-request: !7077
2022-03-16 10:50:43 -04:00
Brad King
fee36b7a78 BinUtils: Restore llvm-ar fallback on Apple platforms
Since commit 29ea94e17c (BinUtils: Avoid llvm-ar on Apple platforms,
2022-03-03, v3.21.6~1^2) we do not consider `llvm-ar` at all on Apple
platforms.  However, there are existing cross-compiling use cases in
which the toolchain has `llvm-ar` but not `ar`.  Prior to the
re-ordering in commit cf82300a63 (BinUtils: Clarify search logic and
make it more consistent, 2021-05-27, v3.21.0-rc1~119^2~2), we preferred
`ar` and then `llvm-ar`.  Restore the original order for Apple.

Fixes: #23320
2022-03-16 10:46:11 -04:00
Brad King
4dd0deca7d Merge branch 'release-3.21' into release-3.22 2022-03-11 10:33:42 -05:00