mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,639 Commits 2 Branches 385 Tags
5dfcb318a085bfd4cfa96f931323a2e6affbb5ff
Commit Graph

31714 Commits

Author SHA1 Message Date
Kitware Robot
393dbe7ea1 CMake Nightly Date Stamp 2021-12-17 00:01:09 -05:00
Brad King
d5026daa9e Merge topic 'link-interface-backtrace' 
1d709ea2f5 cmGeneratorTarget: Propagate backtraces from INTERFACE_LINK_LIBRARIES
a84a62e0a7 cmTarget: Record backtraces for INTERFACE_LINK_LIBRARIES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6805
 2021-12-16 10:38:56 -05:00
Brad King
d71425f989 Merge topic 'vs-csproj-scripts' 
dff98aa9ca VS: add missing label in C# project-build events

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6801
 2021-12-16 10:36:56 -05:00
Brad King
4663c82f9e Merge topic 'msvc_cuda_propagate_defines_to_ptx' 
574b492b47 CUDA: Visual Studio Generator propagates definitions for PTX files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6802
 2021-12-16 10:27:21 -05:00
Kitware Robot
2c79dc95a2 CMake Nightly Date Stamp 2021-12-16 00:02:06 -05:00
Steven Boswell
dff98aa9ca VS: add missing label in C# project-build events 2021-12-15 11:11:48 -07:00
Brad King
1d709ea2f5 cmGeneratorTarget: Propagate backtraces from INTERFACE_LINK_LIBRARIES 2021-12-15 12:29:47 -05:00
Brad King
a84a62e0a7 cmTarget: Record backtraces for INTERFACE_LINK_LIBRARIES 2021-12-15 12:29:44 -05:00
Brad King
029c8f5065 Merge topic 'custom-command-main-dependency' 
780341f360 cmCustomCommand: Track main dependency explicitly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6800
 2021-12-15 08:52:52 -05:00
Kitware Robot
7de214699f CMake Nightly Date Stamp 2021-12-15 00:01:12 -05:00
unknown
574b492b47 CUDA: Visual Studio Generator propagates definitions for PTX files 
From CUDA 9.0 to CUDA 11.4 the CUDA Visual Studio integration
defines omitted user defines from PTX generation.

With CUDA 11.5 this has been resolved, so we backport the fix
to allow for consistent behavior when using CMake
 2021-12-14 14:55:48 -05:00
NAKAMURA Takumi
780341f360 cmCustomCommand: Track main dependency explicitly 
Store the main dependency as the first entry in the dependency list plus
a boolean member indicating its existence.  Note that this slightly
changes existing behavior: the main dependency was previously the last
entry of the dependency list.
 2021-12-14 10:48:43 -05:00
Brad King
25a300b76e Merge topic 'fix-list-transform-invalid-index-crashes' 
7dd3e99270 cmListCommand: Handle invalid FOR selector ranges

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6786
 2021-12-14 09:36:08 -05:00
Kitware Robot
7a408511bd CMake Nightly Date Stamp 2021-12-14 00:02:09 -05:00
Kitware Robot
61ec751d8a CMake Nightly Date Stamp 2021-12-13 00:02:18 -05:00
Kitware Robot
cdaabf45f8 CMake Nightly Date Stamp 2021-12-12 00:01:06 -05:00
Kitware Robot
879f77a195 CMake Nightly Date Stamp 2021-12-11 00:01:12 -05:00
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
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
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
Nick Muggio
7dd3e99270 cmListCommand: Handle invalid FOR selector ranges 
Fixes crashes involving invalid ranges specified in list(TRANSFORM ...
FOR ...) calls.
* Report error when step is not positive
* Report error when start is after stop

Fixes: #22985
 2021-12-08 20:54:04 -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
Kitware Robot
1cef966475 CMake Nightly Date Stamp 2021-12-08 00:02:13 -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
b59f7600c4 HIP: Enable CMAKE_EXPORT_COMPILE_COMMANDS for HIP 
Fixes: #22986
 2021-12-07 09:34:49 -05:00
Kitware Robot
d9d0a34fef CMake Nightly Date Stamp 2021-12-07 00:02:06 -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
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
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
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
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
9027545354 Merge topic 'vs-enum-class' 
a80d95b114 cmVisualStudio10TargetGenerator: Change VsProjectType to be enum class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6776
 2021-12-02 11:47:31 -05:00
Brad King
57349a4851 Merge topic 'rpath-unrecognized-format' 
643fc46bdc file(RPATH): Restore tolerance of unknown formats if new RPATH is empty
5596cba7dc cmSystemTools: Remove unnecessary mark-as-used casts to void

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6779
 2021-12-02 11:45:38 -05:00