mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 20:00:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
68,285 Commits 2 Branches 401 Tags
1c04068a8d2478a0cfda4dcb2db54b3f45e24809
Commit Graph

68285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 1c04068a8d Merge topic 'install-DESTINATION-regression' 
92e63421cb install: Restore treatment of DESTINATION as a single-valued keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10088
 2024-12-12 09:01:19 -05:00
Kitware Robot dd913e9edc CMake Nightly Date Stamp 2024-12-12 00:01:15 -05:00
Brad King 54e998629d Merge branch 'release-3.31' 2024-12-11 10:10:04 -05:00
Brad King 77ae9d7585 Merge topic 'codegen-make' 
25b43a5b7f Makefile: Enable progress messages for codegen target
af2b340a2e Makefile: Fix per-directory codegen target
b7e6c418e3 cmLocalUnixMakefileGenerator3: Simplify progress command generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10085
 2024-12-11 10:10:03 -05:00
Brad King 4671919cbb Merge topic 'codegen-make' into release-3.31 
25b43a5b7f Makefile: Enable progress messages for codegen target
af2b340a2e Makefile: Fix per-directory codegen target
b7e6c418e3 cmLocalUnixMakefileGenerator3: Simplify progress command generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10085
 2024-12-11 10:10:02 -05:00
Craig Scott 92e63421cb install: Restore treatment of DESTINATION as a single-valued keyword 
The `install(RUNTIME_DEPENDENCY_SET)` form processes its arguments in a
slightly different way to other forms of the command. It handles the
`POST_...`, `PRE_...` and `DIRECTORIES` keywords separately. These
keywords are not visible to the first layer of keyword processing, so
they don't terminate multi-value keyword value parsing.

Before commit 6a1fac1450 (install: Normalize DESTINATION paths,
2024-09-18, v3.31.0-rc1~73^2), the `DESTINATION` keyword was handled as
a simple string value. That commit changed it to use a function so it
could process the value before storing it, but the function returned the
wrong value. This meant it was treated as a multi-value keyword instead
of a single-value keyword.

Fixes: #26512
 2024-12-11 09:58:39 -05:00
Brad King 85f4fdc000 Merge topic 'debugger-working-directory' 
0a9fb88121 fileapi: Report DEBUGGER_WORKING_DIRECTORY in codemodel-v2 target objects
9ed178f9d8 Add generator-agnostic DEBUGGER_WORKING_DIRECTORY target property
200efab4d4 Tests/RunCMake/FileAPI: Improve error on unexpected line numbers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10075
 2024-12-11 09:47:03 -05:00
Brad King f51d6aee2f Merge topic 'android-native' 
f3ecddbaa2 cmAffinity: Fix compilation in native Android builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10083
 2024-12-11 09:45:31 -05:00
Brad King 6ae6d879f5 Merge topic 'improve-coding-conventions' 
b4704d3ef8 Help/dev: Improve coding conventions guide

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10086
 2024-12-11 09:44:40 -05:00
Brad King e9fffd93fa Merge branch 'release-3.31' 2024-12-11 09:42:09 -05:00
Brad King 9f8dbcda3b Merge topic 'codegen-ninja' 
5ce1ca607f Ninja: Add missing top-level codegen dependencies on per-directory codegen
5d0f2aba7e cmGlobalNinjaGenerator: Simplify per-directory configuration list lookup
505ffdcbde cmGlobalNinjaGenerator: Clarify order of codegen build statement logic
5f33736c03 cmGlobalNinjaGenerator: Fix local variable name for codegen target
e308d1bb88 cmGlobalNinjaGenerator: Remove unnecessary local variable
c08543d711 cmGlobalNinjaGenerator: Remove unused local variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10084
 2024-12-11 09:42:09 -05:00
Brad King f5c5b39ce8 Merge topic 'codegen-ninja' into release-3.31 
5ce1ca607f Ninja: Add missing top-level codegen dependencies on per-directory codegen
5d0f2aba7e cmGlobalNinjaGenerator: Simplify per-directory configuration list lookup
505ffdcbde cmGlobalNinjaGenerator: Clarify order of codegen build statement logic
5f33736c03 cmGlobalNinjaGenerator: Fix local variable name for codegen target
e308d1bb88 cmGlobalNinjaGenerator: Remove unnecessary local variable
c08543d711 cmGlobalNinjaGenerator: Remove unused local variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10084
 2024-12-11 09:42:07 -05:00
Kitware Robot 4b99073192 CMake Nightly Date Stamp 2024-12-11 00:01:31 -05:00
Matthew Woehlke b4704d3ef8 Help/dev: Improve coding conventions guide 
Improve the coding conventions specified in our source code guide:

- Recommend capitalization for locals as well as members.

- Remove exceptions for `const` placement; new code should always prefer
  "east" style.

- Remove separate section; "Code Style" and "Code Conventions" are
  similar enough to not need to make a distinction.
 2024-12-10 14:18:08 -05:00
Brad King 5ce1ca607f Ninja: Add missing top-level codegen dependencies on per-directory codegen 
In commit 197cb419d1 (add_custom_command: Add CODEGEN support,
2024-05-27, v3.31.0-rc1~394^2) we accidentally left out the global
`codegen` target's dependencies on the per-directory `codegen` targets.
Add them for parity with the `all` target.

Fixes: #26517
 2024-12-10 11:46:31 -05:00
Brad King 5d0f2aba7e cmGlobalNinjaGenerator: Simplify per-directory configuration list lookup 2024-12-10 11:41:27 -05:00
Brad King 505ffdcbde cmGlobalNinjaGenerator: Clarify order of codegen build statement logic 
Make it more consistent with the equivalent logic for "all".
 2024-12-10 11:41:27 -05:00
Brad King 5f33736c03 cmGlobalNinjaGenerator: Fix local variable name for codegen target 2024-12-10 11:41:26 -05:00
Brad King e308d1bb88 cmGlobalNinjaGenerator: Remove unnecessary local variable 2024-12-10 11:41:26 -05:00
Brad King c08543d711 cmGlobalNinjaGenerator: Remove unused local variable 2024-12-10 11:41:26 -05:00
Brad King 25b43a5b7f Makefile: Enable progress messages for codegen target 
This was left out of commit 197cb419d1 (add_custom_command: Add CODEGEN
support, 2024-05-27, v3.31.0-rc1~394^2).
 2024-12-10 11:36:29 -05:00
Brad King af2b340a2e Makefile: Fix per-directory codegen target 
Issue: #26517
 2024-12-10 11:36:29 -05:00
Brad King b7e6c418e3 cmLocalUnixMakefileGenerator3: Simplify progress command generation 2024-12-10 11:36:29 -05:00
Brad King ed0baf1ec5 Merge topic 'rvm_refactor' 
f06b2af291 Tests/FindRuby/Rvm: Honor Ruby_FIND_VIRTUALENV ONLY
a023377b86 FindRuby: Move checking of RVM and System Ruby to separate functions.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10071
 2024-12-10 09:18:31 -05:00
Brad King 90e3d69551 Merge topic 'hurd-rpath-origin' 
8d2f6f0971 hurd: Fix runtime path test
0c452257e7 hurd: Add relative rpath support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10078
 2024-12-10 09:17:30 -05:00
Brad King f0a79d35df Merge topic 'swift-module-dir-genex' 
4de5ef45f0 ci: Enable Swift tests in Ninja Multi-Config job on Windows
e1d635e71c Swift: Expand generator expressions in Swift_MODULE_DIRECTORY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10062
 2024-12-10 09:15:59 -05:00
Brad King 97193120d6 Merge topic 'fix-jsoncpp-version-iwyu' 
75f53f9e11 IWYU: Add mapping for jsoncpp version.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10081
 2024-12-10 09:14:54 -05:00
Brad King a4c706a5e6 Merge topic 'isolate-find_package-tests' 
c10e1ea979 Tests: Better isolate find_package tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10080
 2024-12-10 09:14:00 -05:00
Brad King 621c54bbbc Merge branch 'release-3.31' 2024-12-10 09:12:04 -05:00
Brad King 27be881b3f Merge topic 'vs-clang-cl-c++23' 
30139913e9 VS: Restore support for mixing C++23 and C in one target with clang-cl
57da8712c1 VS: Factor out check for mixed C and C++ target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10082
 2024-12-10 09:12:04 -05:00
Brad King c5ad3f9792 Merge topic 'vs-clang-cl-c++23' into release-3.31 
30139913e9 VS: Restore support for mixing C++23 and C in one target with clang-cl
57da8712c1 VS: Factor out check for mixed C and C++ target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10082
 2024-12-10 09:12:02 -05:00
Garrett Campbell 0a9fb88121 fileapi: Report DEBUGGER_WORKING_DIRECTORY in codemodel-v2 target objects 
Closes: #16478
 2024-12-10 09:04:31 -05:00
Brad King f3ecddbaa2 cmAffinity: Fix compilation in native Android builds 
Fixes: #26516
 2024-12-10 08:44:08 -05:00
Kitware Robot a2c30a4eeb CMake Nightly Date Stamp 2024-12-10 00:01:29 -05:00
Brad King 30139913e9 VS: Restore support for mixing C++23 and C in one target with clang-cl 
Since commit 474eafe28c (clang-cl: Add support for C++23, 2024-09-13,
v3.31.0-rc1~97^2) we use a Clang-specific flag to enable C++23 since
`clang-cl` has no `-std:c++23` flag, and `-std:c++latest` may enable an
even newer version of C++.  However, in `.vcxproj` files there is no way
to express a target-wide `-clang:-std=c++23` flag for only C++ sources
when the target also has C sources.  Add a special case to map back to
`-std:c++latest` for targets with C++23 and C together.

Fixes: #26508
 2024-12-09 14:57:35 -05:00
Brad King 57da8712c1 VS: Factor out check for mixed C and C++ target 2024-12-09 14:19:51 -05:00
Matthew Woehlke 75f53f9e11 IWYU: Add mapping for jsoncpp version.h 
Add an IWYU rule for `version.h` from `jsoncpp`. This mirrors the
existing rules that recommend `value.h` for things from `forwards.h` and
`config.h`, and is needed for IWYU to not complain about use of things
from `version.h`. (This is especially important as we do not directly
wrap `version.h`.)
 2024-12-09 14:13:05 -05:00
Brad King 4de5ef45f0 ci: Enable Swift tests in Ninja Multi-Config job on Windows 2024-12-09 13:43:28 -05:00
Evan Wilde e1d635e71c Swift: Expand generator expressions in Swift_MODULE_DIRECTORY 
This patch makes the `Swift_MODULE_DIRECTORY` property behave more like
the other output directory properties, allowing generator expressions
and fixing the behavior with multi-config generators.

Issue: #26010
 2024-12-09 10:37:05 -08:00
Matthew Woehlke c10e1ea979 Tests: Better isolate find_package tests 
Tweak find_package test to turn off as much searching of the host
environment as possible. This should make the tests less likely to be
affected in case the host system happens to have a package with the same
name as one of the test packages.
 2024-12-09 10:52:55 -05:00
Garrett Campbell 9ed178f9d8 Add generator-agnostic DEBUGGER_WORKING_DIRECTORY target property 
Generalize the `VS_DEBUGGER_WORKING_DIRECTORY` property.

Issue: #16478
 2024-12-09 10:47:10 -05:00
cfis f06b2af291 Tests/FindRuby/Rvm: Honor Ruby_FIND_VIRTUALENV ONLY 2024-12-09 10:15:52 -05:00
Brad King 41cd84174a Merge topic 'makefile-stack-manipulation' 
dcaa52c6c3 PrintCallStack: "Fix" entry suppression
a73955ae76 cmMakefile: Allow arbitrary stack manipulation
de5700a15a cmMakefile: Prevent copying RAII helpers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10067
 2024-12-09 10:00:52 -05:00
Brad King b66c010033 Merge topic 'refactor-find_package' 
e2a6416622 find_package: Refactor in support of recursion
bd542748af find_package: Use map::emplace instead of make_pair

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10054
 2024-12-09 09:59:00 -05:00
Brad King bf3d80981d Merge topic 'patch-condition-arguments-examples' 
70ccf47e60 Help: Add more examples for condition syntax in commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10073
 2024-12-09 09:57:41 -05:00
Brad King 8c53b0be2a Merge topic 'xcode-embed-frameworks' 
0282429c5a Xcode: Fix XCODE_EMBED_FRAMEWORKS when settings differ across targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9985
 2024-12-09 09:56:10 -05:00
Samuel Thibault 8d2f6f0971 hurd: Fix runtime path test 2024-12-09 10:25:20 +01:00
Kitware Robot 29302e11bb CMake Nightly Date Stamp 2024-12-09 00:01:29 -05:00
Samuel Thibault 0c452257e7 hurd: Add relative rpath support 2024-12-09 01:22:18 +01:00
Kitware Robot 175b74ed0a CMake Nightly Date Stamp 2024-12-08 00:01:39 -05:00