mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-16 20:21:41 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,603 Commits 2 Branches 390 Tags
a6fa3fa136c291c36aefbc79b62995a63bf9107b
Commit Graph

55603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
a6fa3fa136 Merge topic 'msbuild-target-inputs-object-depends' 
abc6377469 VS: Add OBJECT_DEPENDS as AdditionalDependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6775
 2021-12-10 09:15:46 -05:00
Brad King
9f5e0629df Merge topic 'link-iface-usage-reqs-only' 
1e49880472 cmGeneratorTarget: Avoid boolean trap in usage requirement lookup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6796
 2021-12-10 09:14:53 -05:00
Brad King
114c7e72eb Merge topic 'ci-nmake-jom' 
9f5c872ed1 ci: Exclude spuriously failing test from JOM nightly CI job

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6797
 2021-12-10 09:13:58 -05:00
Kitware Robot
3abd90ac22 CMake Nightly Date Stamp 2021-12-10 00:01:09 -05:00
Brad King
1e49880472 cmGeneratorTarget: Avoid boolean trap in usage requirement lookup 
Replace `bool usage_requirements_only` arguments with a proper
enumeration to clarify meaning at call sites.
 2021-12-09 11:00:23 -05:00
Brad King
9f5c872ed1 ci: Exclude spuriously failing test from JOM nightly CI job 
Since commit 3b9975d9b5 (ci: Add JOM nightly CI job, 2021-11-17) the
`ExternalProject` test often fails spuriously with an internal error
message from JOM.  Exclude it for now pending further investigation.

Prior to covering JOM in CI, it was covered by a standalone nightly
build that excluded the `ExternalProject` test for the same reason.
 2021-12-09 10:42:13 -05:00
Brad King
f22aa2f466 Merge topic 'tests_if_version' 
1a813273ca Tests: Add more version comparison tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6791
 2021-12-09 10:40:11 -05:00
Brad King
78c20892bf Merge topic 'ctest-add_subdirectory' 
7c5a120c38 Tests: Add case covering both ctest subdirectory commands
04deda1d2a CTest: Extract common implementation of add_subdirectory and subdirs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6795
 2021-12-09 10:39:20 -05:00
Brad King
01e768850a Merge topic 'simplify-backtrace' 
61c46c95ae cmListFileContext: Simplify explicit rule-of-five members
d0ceb409ff cmListFileBacktrace: Remove unused "Depth" method
7b677dbb92 cmListFileBacktrace: Remove unused "bottom" entry
56dc22d488 cmMessenger: Make relative path conversion more explicit
c749982c13 cmTargetPropertyComputer: Simplify by restoring use of cmMakefile
3d378541bb cmMessenger: Adopt backtrace printing functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6794
 2021-12-09 10:38:27 -05:00
Dietmar Scheidl
abc6377469 VS: Add OBJECT_DEPENDS as AdditionalDependencies 
Fixes: #22733
 2021-12-09 16:22:10 +01:00
Kitware Robot
4c23e0272b CMake Nightly Date Stamp 2021-12-09 00:02:09 -05:00
Brad King
fa5055eb56 Merge topic 'doc-function-naming' 
74f1fbb7a1 Help/dev: Cover module function naming in CMake Documentation Guide

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6793
 2021-12-08 18:02:08 -05:00
Brad King
74f1fbb7a1 Help/dev: Cover module function naming in CMake Documentation Guide 2021-12-08 17:05:25 -05:00
Paweł Bylica
1a813273ca Tests: Add more version comparison tests 2021-12-08 12:05:36 -05:00
Brad King
7c5a120c38 Tests: Add case covering both ctest subdirectory commands 
CTest re-implements the `subdirs` and `add_subdirectory` commands.
Verify that they both work.
 2021-12-08 11:36:50 -05:00
friendlyanon
04deda1d2a CTest: Extract common implementation of add_subdirectory and subdirs 
The two functions have basically the same functionality in a CTest
context, however the add_subdirectory implementation was missing code
for changing the current working directory similarly to how it was done
for subdirs. This commit extracts the common code and also fixes that
bug.

Issue: #22921
 2021-12-08 11:36:43 -05:00
Brad King
61c46c95ae cmListFileContext: Simplify explicit rule-of-five members 2021-12-08 10:31:55 -05:00
Brad King
d0ceb409ff cmListFileBacktrace: Remove unused "Depth" method 2021-12-08 10:31:48 -05:00
Brad King
7b677dbb92 cmListFileBacktrace: Remove unused "bottom" entry 
All uses of `GetBottom` by clients have been removed, so drop the
method and its supporting infrastructure.
 2021-12-08 10:03:48 -05:00
Brad King
56dc22d488 cmMessenger: Make relative path conversion more explicit 
Move the decision to convert to call stacks to relative paths out to the
client.  Avoid using `cmState` to make the decision ourselves.
 2021-12-08 10:03:48 -05:00
Brad King
c749982c13 cmTargetPropertyComputer: Simplify by restoring use of cmMakefile 
Logically revert commit 390a7d8647 (cmTargetPropertyComputer: Implement
GetProperty without cmMakefile, 2016-10-13, v3.8.0-rc1~445^2~9).
It relied on using `cmListFileBacktrace` to get a scope in which to
look up policies.

This does remove a backtrace from `LOCATION` property errors at generate
time, but the backtrace we reported before was incorrect.  It pointed at
the addition of a target, not to the reference to the property.
 2021-12-08 10:03:48 -05:00
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