Commit Graph

55732 Commits

Author SHA1 Message Date
Brad King 3d378541bb cmMessenger: Adopt backtrace printing functions
Move backtrace printing functions from `cmListFileBacktrace` over to
`cmMessenger`, their primary caller.  Thread `cmMessenger` instances
through APIs needed to update other call sites.
2021-12-08 10:03:48 -05:00
Brad King 642238b302 Merge branch 'release-3.22' 2021-12-08 09:53:59 -05:00
Brad King 2393020b4f Merge topic 'python3.11-support'
43844c5d82 FindPython: Add support for Python 3.11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Marc Chevrier <marc.chevrier@gmail.com>
Merge-request: !6792
2021-12-08 09:53:59 -05:00
Brad King 6752fb2889 Merge topic 'python3.11-support' into release-3.22
43844c5d82 FindPython: Add support for Python 3.11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Marc Chevrier <marc.chevrier@gmail.com>
Merge-request: !6792
2021-12-08 09:53:58 -05:00
Kitware Robot 1cef966475 CMake Nightly Date Stamp 2021-12-08 00:02:13 -05:00
Tomáš Hrnčiar 43844c5d82 FindPython: Add support for Python 3.11 2021-12-07 12:41:01 -05:00
Brad King 15adc8f9b6 Merge branch 'release-3.22' 2021-12-07 12:05:43 -05:00
Brad King aa6a33fe54 CMake 3.22.1 v3.22.1 2021-12-07 10:44:21 -05:00
Brad King 28fa21dc83 Merge branch 'release-3.22' 2021-12-07 10:41:15 -05:00
Brad King 932921d550 Merge topic 'rel-macos-sign-notarize' into release-3.22
bed4b1583e Utilities/Release: Add script to sign/notarize macOS application bundle

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6784
2021-12-07 10:41:14 -05:00
Brad King 1c78265640 Merge topic 'rel-macos-sign-notarize'
2247a7929d Utilities/Release: Update macOS signing script for CPack OSXX11 removal
bc01eda290 Merge branch 'backport-3.22-rel-macos-sign-notarize' into rel-macos-sign-notarize
bed4b1583e Utilities/Release: Add script to sign/notarize macOS application bundle

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6784
2021-12-07 10:41:14 -05:00
Brad King bbfbadea36 Merge branch 'release-3.22' 2021-12-07 09:54:10 -05:00
Brad King d6993e593d Merge topic 'makefile-CMAKE_EXPORT_COMPILE_COMMANDS-HIP'
b59f7600c4 HIP: Enable CMAKE_EXPORT_COMPILE_COMMANDS for HIP

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6789
2021-12-07 09:54:10 -05:00
Brad King 25e9131c79 Merge topic 'makefile-CMAKE_EXPORT_COMPILE_COMMANDS-HIP' into release-3.22
b59f7600c4 HIP: Enable CMAKE_EXPORT_COMPILE_COMMANDS for HIP

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6789
2021-12-07 09:54:09 -05:00
Brad King f30b91096d Merge branch 'release-3.22' 2021-12-07 09:37:29 -05:00
Brad King 79afbb2bb3 Merge topic 'lib-arch-no-usr'
d4ba945c48 CMakeParseLibraryArchitecture: Fix parsing /lib/<arch> implicit object path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6790
2021-12-07 09:37:29 -05:00
Brad King 7fcc8791b4 Merge topic 'lib-arch-no-usr' into release-3.22
d4ba945c48 CMakeParseLibraryArchitecture: Fix parsing /lib/<arch> implicit object path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6790
2021-12-07 09:37:28 -05:00
Brad King b59f7600c4 HIP: Enable CMAKE_EXPORT_COMPILE_COMMANDS for HIP
Fixes: #22986
2021-12-07 09:34:49 -05:00
Brad King 0a46df3c91 Merge topic 'FindOpenSSL-applink'
586d483983 FindOpenSSL: Fix typo in applink condition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6787
2021-12-07 09:33:26 -05:00
Brad King d40682dd06 Merge topic 'FindOpenSSL-lib64'
ae48449cf0 FindOpenSSL: Search in lib64 directories on non-Windows platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6788
2021-12-07 09:32:37 -05:00
Kitware Robot d9d0a34fef CMake Nightly Date Stamp 2021-12-07 00:02:06 -05:00
Brad King 2247a7929d Utilities/Release: Update macOS signing script for CPack OSXX11 removal
Since  commit 4ef974e6cb (CPack: Remove undocumented deprecated OSXX11
generator, 2021-11-05), the `CPack.OSXScriptLauncher.in` binary is no
longer installed in the `CMake.app` bundle, so it does not need to be
signed.
2021-12-06 17:12:37 -05:00
Brad King bc01eda290 Merge branch 'backport-3.22-rel-macos-sign-notarize' into rel-macos-sign-notarize 2021-12-06 17:12:21 -05:00
Brad King bed4b1583e Utilities/Release: Add script to sign/notarize macOS application bundle
We produce macOS binaries for `cmake.org` using GitLab CI jobs.
Binaries for official releases are additionally signed and notarized
manually by a maintainer with suitable signing certificates and Apple
developer account credentials.  Add a script to drive these steps.
2021-12-06 17:11:26 -05:00
Raphael Gozzo d4ba945c48 CMakeParseLibraryArchitecture: Fix parsing /lib/<arch> implicit object path
The current regular expression is able to match `/usr/lib/<arch>`,
`/usr/usr/lib/<arch>`, `/usr/usr/usr/lib/<arch>`, ... but not
`/lib/<arch>`.

This behavior ends up causing the detected architecture to
be x86_64-pc-linux-gnu when the Clang compiler is installed on
a "non-system" location (like /opt/llvm-13) which, in turn, makes
almost every 'find_library()' fail because the correct
architecture is x86_64-linux-gnu.

This is due to a typo in commit 764606e256 (CMakeDetermineCompilerABI:
Extract lib arch from implicit object file paths, 2021-04-05,
v3.20.1~10^2), which used `+` instead of `?`.
2021-12-06 16:47:29 -05:00
Brad King d2b83388c2 Merge topic 'vs-debugger-settings'
19e37116cb VS: Move LocalDebugger* settings to the end of their PropertyGroup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6783
2021-12-06 15:16:53 -05:00
Brad King 290ff01849 Merge branch 'release-3.22' 2021-12-06 15:16:01 -05:00
Brad King b3f1f568d3 Merge topic 'ci-vs-managed'
69419c5870 ci: Enable more VS tests that use managed code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6782
2021-12-06 15:16:00 -05:00
Brad King 60ebe5f3da Merge topic 'ci-vs-managed' into release-3.22
69419c5870 ci: Enable more VS tests that use managed code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6782
2021-12-06 15:15:59 -05:00
Brad King ae48449cf0 FindOpenSSL: Search in lib64 directories on non-Windows platforms
The upstream `openssl` build system may install libraries to `lib64`
even on platforms whose conventions do not use `lib64` for
distro-packaged libraries.

Fixes: #22945
2021-12-06 12:03:08 -05:00
Brad King 586d483983 FindOpenSSL: Fix typo in applink condition
In commit 7b83ca816a (FindOpenSSL: add target OpenSSL::applink to
support OpenSSL's applink feature, 2020-05-12, v3.18.0-rc1~150^2) the
version check was written as "major.major.fix" instead of
"major.minor.fix".
2021-12-06 10:50:25 -05:00
Kitware Robot 14f8990a60 CMake Nightly Date Stamp 2021-12-06 00:03:24 -05:00
Kitware Robot a54f18ff36 CMake Nightly Date Stamp 2021-12-05 00:02:10 -05:00
Kitware Robot b00cb8f405 CMake Nightly Date Stamp 2021-12-04 00:02:33 -05:00
Cedric Martineau 19e37116cb VS: Move LocalDebugger* settings to the end of their PropertyGroup
Define the settings after others like `OutDir` so that the latter can be
referenced.

Fixes: #18094
2021-12-03 11:49:33 -05:00
Brad King 69419c5870 ci: Enable more VS tests that use managed code
A couple of VS tests were conditioned on `NOT CMAKE_GENERATOR_TOOLSET`,
but in CI jobs with VS we always set `CMAKE_GENERATOR_TOOLSET`.  Make
the condition specific to excluding the `v90` toolset, which was its
original intention anyway.
2021-12-03 09:09:04 -05:00
Brad King 949227b5d4 Merge branch 'release-3.22' 2021-12-03 08:54:34 -05:00
Brad King 9ecb24b5a7 Merge topic 'vs-csproj-scripts'
13a7ae2194 VS: Revert "Add missing label in C# project-build events"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6781
2021-12-03 08:54:34 -05:00
Brad King 67cbfed819 Merge topic 'vs-csproj-scripts' into release-3.22
13a7ae2194 VS: Revert "Add missing label in C# project-build events"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6781
2021-12-03 08:54:33 -05:00
Brad King cf32ffda05 Merge branch 'release-3.22' 2021-12-03 08:53:26 -05:00
Brad King 6627cc23b4 Merge topic 'FindPkgConfig-pkgconf'
90a49647e9 FindPkgConfig: Restore finding pkg-config before pkgconf

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6780
2021-12-03 08:53:26 -05:00
Brad King d565f9f0ee Merge topic 'FindPkgConfig-pkgconf' into release-3.22
90a49647e9 FindPkgConfig: Restore finding pkg-config before pkgconf

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6780
2021-12-03 08:53:25 -05:00
Kitware Robot 824a6836be CMake Nightly Date Stamp 2021-12-03 00:02:10 -05:00
Brad King 13a7ae2194 VS: Revert "Add missing label in C# project-build events"
Revert commit b284a21fee (VS: Add missing label in C# project-build
events, 2021-09-03, v3.22.0-rc1~156^2).  The change broke cases using
multiple successful custom commands.  Revert it pending further
investigation into the interaction of the generated script code with
`Microsoft.Common.CurrentVersion.targets`, and whether this is needed
for all managed projects or just C# projects.

Also add a test covering the case that was broken.

Fixes: #22964
Issue: #21440
2021-12-02 18:06:39 -05:00
Brad King 90a49647e9 FindPkgConfig: Restore finding pkg-config before pkgconf
Since commit 94a84dc0af (FindPkgConfig: add pkgconf to the search list.,
2021-07-02, v3.22.0-rc1~468^2), `pkgconf` is preferred over `pkg-config`
if they appear in the same directory.  In some environments,
`pkg-config` may be a wrapper that adds semantics beyond either
`pkgconf` or the normal `pkg-config`.  Prefer `pkg-config` over
`pkgconf` in order to preserve the prior behavior in such environments.

Fixes: #22976
2021-12-02 12:38:22 -05:00
Brad King 2d4c3cf684 Merge topic 'ifw-sign-installer'
e8e07a90c1 CPackIFW: add support for signing the generated app bundles on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6754
2021-12-02 12:32:01 -05:00
Brad King 304e5e3584 Merge topic 'cleanup-ConvertToIncludeReference'
94a58e502b cmLocalGenerator: Remove unused IncludePathStyle infrastructure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6777
2021-12-02 11:50:39 -05:00
Brad King ec8e7ead28 Merge topic 'semi-warnings'
4b548c1028 Source: Fix -Wmissing-variable-declarations warning
29ffa5f48c Source: fix -Wextra-semi-stmt warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6758
2021-12-02 11:49:52 -05:00
Brad King b2ad2ab37b Merge branch 'release-3.22' 2021-12-02 11:48:39 -05:00
Brad King 3bb6e0dd00 Merge topic 'FindPython-static-libs-hint'
a35bf772de FindPython: clarify static libraries hint usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6772
2021-12-02 11:48:39 -05:00