mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 21:00:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,589 Commits 2 Branches 401 Tags
52152409c364f333ec67ec899a22eebab4d3f0ab
Commit Graph

50589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxime Girard 52152409c3 Makefiles: Honor CMAKE_EXPORT_COMPILE_COMMANDS for ASM 
Generate build command for assembly file in `compile_command.json`.

Issue: #20059
 2020-11-04 15:36:47 -05:00
Brad King 622ac065d2 Merge topic '19128_ICU_case_consistency' 
ec23338187 FindICU: Improve case consistency in documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5452
 2020-11-03 07:32:20 -05:00
Brad King eea24ca551 Merge topic 'cmprop-grl' 
f808f27919 cmLocalGenerator::GetRuleLauncher: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5456
 2020-11-03 07:31:03 -05:00
Brad King 7cef3fad02 Merge topic 'nmc-test-fix' 
e0a7c0d40d Tests: Fix one RunCMake.NinjaMultiConfig case name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5447
 2020-11-03 07:30:01 -05:00
Brad King 23d379674b Merge topic 'android-hooks' 
707a06761f Android: add NDK hooks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5436
 2020-11-03 07:27:13 -05:00
Brad King 2bce2b3a3e Merge branch 'release-3.19' 2020-11-03 07:24:25 -05:00
Brad King db02ccf406 Merge topic 'cmake-presets-no-path-arg-warning' 
cb2d01c182 CMakePresets.json: Don't warn if no path argument is given

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5455
 2020-11-03 07:24:25 -05:00
Brad King 855bdc586c Merge topic 'cmake-presets-no-path-arg-warning' into release-3.19 
cb2d01c182 CMakePresets.json: Don't warn if no path argument is given

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5455
 2020-11-03 07:24:25 -05:00
Brad King 48840e427e Merge branch 'release-3.19' 2020-11-03 07:22:55 -05:00
Brad King e8adc3654a Merge topic 'fix-cuda-qnx' 
0832516bec Help: Add 3.19 release note about CUDA support on QNX
bcdd486bf7 CUDA: Enable support on QNX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5446
 2020-11-03 07:22:55 -05:00
Brad King 37d75e5fdd Merge topic 'fix-cuda-qnx' into release-3.19 
0832516bec Help: Add 3.19 release note about CUDA support on QNX
bcdd486bf7 CUDA: Enable support on QNX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5446
 2020-11-03 07:22:54 -05:00
Craig Scott 84f2c9de5c Merge branch 'release-3.19' 2020-11-03 04:21:15 -05:00
Craig Scott 15578c465a Merge topic 'doc-cpack-pre-post-scripts' into release-3.19 
b77dfa441f Help: Clarify variables specifying scripts to execute during packaging

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !5454
 2020-11-03 04:21:15 -05:00
Craig Scott a18903a655 Merge topic 'doc-cpack-pre-post-scripts' 
b77dfa441f Help: Clarify variables specifying scripts to execute during packaging

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !5454
 2020-11-03 04:21:15 -05:00
Craig Scott b77dfa441f Help: Clarify variables specifying scripts to execute during packaging 
Relates: #19077
 2020-11-03 20:11:38 +11:00
Kitware Robot 1a1008c3f3 CMake Nightly Date Stamp 2020-11-03 00:01:05 -05:00
vvs31415 f808f27919 cmLocalGenerator::GetRuleLauncher: return cmProp 2020-11-02 13:07:46 -05:00
Brad King e0a7c0d40d Tests: Fix one RunCMake.NinjaMultiConfig case name 
The CustomCommandGenerator `debug-in-release-graph-clean` case actually
cleans using the Debug graph.  This is intentional in order to test
cleaning only the Debug parts, so fix the test name rather than changing
what graph it uses.
 2020-11-02 10:25:54 -05:00
Kyle Edwards cb2d01c182 CMakePresets.json: Don't warn if no path argument is given 
If --preset is specified with no path argument, use the current
directory as the source directory, the preset's binaryDir as the
binary directory, and don't issue the standard warning for no path
specified.

Fixes: #21386
 2020-11-02 09:46:08 -05:00
Brad King 91e826fd75 Merge branch 'release-3.19' 2020-11-02 09:43:34 -05:00
Brad King 81e27967d9 Merge topic 'FindBoost-config-mode' into release-3.19 
685fa8bec0 FindBoost: Avoid leaking internal Boost_ROOT setting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5445
 2020-11-02 09:43:33 -05:00
Brad King fa60d56c87 Merge topic 'FindBoost-config-mode' 
685fa8bec0 FindBoost: Avoid leaking internal Boost_ROOT setting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5445
 2020-11-02 09:43:33 -05:00
Brad King 0832516bec Help: Add 3.19 release note about CUDA support on QNX 2020-11-02 09:39:36 -05:00
janbernloehr bcdd486bf7 CUDA: Enable support on QNX 
This fixes the following two issues with the CUDA support on QNX:

* cuda target name is not derived correctly (should be `aarch64-qnx`).
* linking `cudart` must not be linked against `rt`, `dl`, `pthread`.

This enables to use cmake's native cuda support on QNX.

Fixes: #21381
 2020-11-02 09:39:36 -05:00
Kyle Edwards 89310efa4a Merge topic 'fix-test-for-qemu' 
8c42cfb2e8 test/CMakeLib: make testUVProcessChain work with qemu

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5442
 2020-11-02 09:31:08 -05:00
Kitware Robot 4a266a2679 CMake Nightly Date Stamp 2020-11-02 00:01:18 -05:00
Kitware Robot af4243f054 CMake Nightly Date Stamp 2020-11-01 00:01:04 -04:00
Roger Leigh ec23338187 FindICU: Improve case consistency in documentation 2020-10-31 12:13:30 +00:00
Kitware Robot cc7052f594 CMake Nightly Date Stamp 2020-10-31 00:01:05 -04:00
Brad King 8d6b036449 Merge topic 'custom-command-cleanup' 
3e36d5e846 cmGeneratorTarget: Refactor custom command dependency evaluation
c404f64289 cmCustomCommandGenerator: Collect genex target references in commands
2a640d4199 cmCustomCommandGenerator: Add move operations
fab772c3e1 cmAddCustomCommandCommand: Drop outdated comment
84fecbf214 cmLocalNinjaGenerator: Remove leftover local debugging comment
9e5e2d704a Remove unnecessary arbitrary CollapseFullPath second arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5435
 2020-10-30 09:53:28 -04:00
Brad King 013c4133f7 Merge topic 'CheckSourceRuns-compatibility' into release-3.19 
a524bf3aa7 CheckSourceRuns: do not fail on unrecognized arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5426
 2020-10-30 09:51:35 -04:00
Brad King 78c9c85eb6 Merge branch 'release-3.19' 2020-10-30 09:51:35 -04:00
Brad King 301d82a6ae Merge topic 'CheckSourceRuns-compatibility' 
a524bf3aa7 CheckSourceRuns: do not fail on unrecognized arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5426
 2020-10-30 09:51:35 -04:00
Brad King 685fa8bec0 FindBoost: Avoid leaking internal Boost_ROOT setting 
Since commit 4b2a61946f (FindBoost: Honor BOOST_ROOT when finding
upstream BoostConfig, 2020-10-22, v3.19.0-rc2~14^2) we accidentally leak
our internal setting of `Boost_ROOT`.  Revise the logic to unset our
temporary value.

Fixes: #21379
 2020-10-30 09:42:43 -04:00
Craig Scott 604fa62c01 Merge topic 'string-json-doc-update' into release-3.19 
49fce3373b Help: Clarify string(JSON) error handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5427
 2020-10-30 07:15:40 -04:00
Craig Scott 6b3658aff1 Merge branch 'release-3.19' 2020-10-30 07:15:40 -04:00
Craig Scott f8aaa9fd39 Merge topic 'string-json-doc-update' 
49fce3373b Help: Clarify string(JSON) error handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5427
 2020-10-30 07:15:40 -04:00
Kitware Robot c3cac02d79 CMake Nightly Date Stamp 2020-10-30 00:01:07 -04:00
Haibo Huang 707a06761f Android: add NDK hooks 
This change adds hooks to key Android support files, so that NDK can
inject information or change cmake behaviors.
 2020-10-29 17:52:41 -07:00
Eicke Herbertz 8c42cfb2e8 test/CMakeLib: make testUVProcessChain work with qemu 
When building and testing CMake in a container with qemu
user mode emulation, the expected termination with std::abort()
in testUVProcessChainHelper leads qemu to emit an additional
message about an uncaught signal. There appears to be no way
to make qemu shut up, so any qemu message will be removed
from the output during validation.
 2020-10-29 19:52:54 +01:00
Brad King 32d369aa70 Merge topic 'llvm-rc-CMAKE_RC_FLAGS' 
ea03f50842 llvm_rc: add llvm_rc option filter to correctly pick up all options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5412
 2020-10-29 10:14:20 -04:00
Brad King 3e36d5e846 cmGeneratorTarget: Refactor custom command dependency evaluation 
Previously we only used cmCustomCommandGenerator to evaluate generator
expressions for dependencies.  Use it for command lines too.  It also
collects target references for us, with backtraces.
 2020-10-29 09:37:44 -04:00
Brad King c404f64289 cmCustomCommandGenerator: Collect genex target references in commands 
These will become target-level dependencies.
 2020-10-29 09:37:14 -04:00
Kitware Robot 1d3603a170 CMake Nightly Date Stamp 2020-10-29 00:01:05 -04:00
Ben Boeckel a524bf3aa7 CheckSourceRuns: do not fail on unrecognized arguments 
The old `check_X_source_runs` modules did not verify the arguments, so
we cannot start doing it now. Downgrade the hard error introduced in
commit 357e2ef429 (CheckSoureRuns: Add a unified way to check if a
source runs, 2020-09-14) via !5223 into a noisy warning.
 2020-10-28 15:06:02 -04:00
Brad King 66758221e5 Merge topic 'update-vim-syntax' 
aebdd9ff2c Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax
7b72d3055f vim-cmake-syntax 2020-10-28 (bcc3a97a)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5438
 2020-10-28 11:59:15 -04:00
Brad King aebdd9ff2c Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax 
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2020-10-28 (bcc3a97a)
 2020-10-28 11:30:26 -04:00
vim-cmake-syntax upstream 7b72d3055f vim-cmake-syntax 2020-10-28 (bcc3a97a) 
Code extracted from:

    https://github.com/pboettch/vim-cmake-syntax.git

at commit bcc3a97ab934f03e112becd4ce79286793152b47 (master).

Upstream Shortlog
-----------------

Birger J. Nordølum (1):
      2cf6c041 Add Doxygen keywords

Patrick Boettcher (2):
      3925b48a update to cmake version 3.16.20191028-g0e4190b
      bcc3a97a update to cmake version 3.19.20201028-gdab947f
 2020-10-28 11:22:05 -04:00
Brad King dab947fec0 Merge branch 'release-3.19' into master 2020-10-28 09:10:41 -04:00
Peter Steneteg 49fce3373b Help: Clarify string(JSON) error handling 
Closes: #21355
 2020-10-28 23:09:24 +11:00