summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Android: Add options to control exceptions/rttiHaibo Huang2020-11-044-0/+22
| | | | | | | | | With the NDK's `android.toolchain.cmake`, the user can control whether exceptions/rtti is enabled using `ANDROID_CPP_FEATURES`: https://android.googlesource.com/platform/ndk/+/43b2de34ef9e3a70573fe51a9e069f985a4be5b9/build/cmake/android.toolchain.cmake#548 Add `CMAKE_ANDROID_RTTI` and `CMAKE_ANDROID_EXCEPTIONS` to support that.
* Merge topic '19128_ICU_case_consistency'Brad King2020-11-031-7/+5
|\ | | | | | | | | | | | | ec23338187 FindICU: Improve case consistency in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5452
| * FindICU: Improve case consistency in documentationRoger Leigh2020-10-311-7/+5
| |
* | Merge topic 'cmprop-grl'Brad King2020-11-038-31/+29
|\ \ | | | | | | | | | | | | | | | | | | f808f27919 cmLocalGenerator::GetRuleLauncher: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5456
| * | cmLocalGenerator::GetRuleLauncher: return cmPropvvs314152020-11-028-31/+29
| | |
* | | Merge topic 'nmc-test-fix'Brad King2020-11-032-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e0a7c0d40d Tests: Fix one RunCMake.NinjaMultiConfig case name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5447
| * | | Tests: Fix one RunCMake.NinjaMultiConfig case nameBrad King2020-11-022-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'android-hooks'Brad King2020-11-035-0/+60
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 707a06761f Android: add NDK hooks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5436
| * | | | Android: add NDK hooksHaibo Huang2020-10-305-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | This change adds hooks to key Android support files, so that NDK can inject information or change cmake behaviors.
* | | | | Merge branch 'release-3.19'Brad King2020-11-030-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'cmake-presets-no-path-arg-warning' into release-3.19Brad King2020-11-034-1/+22
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb2d01c182 CMakePresets.json: Don't warn if no path argument is given Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5455
* | \ \ \ \ \ Merge topic 'cmake-presets-no-path-arg-warning'Brad King2020-11-034-1/+22
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb2d01c182 CMakePresets.json: Don't warn if no path argument is given Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5455
| * | | | | | CMakePresets.json: Don't warn if no path argument is givenKyle Edwards2020-11-024-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge branch 'release-3.19'Brad King2020-11-030-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'fix-cuda-qnx' into release-3.19Brad King2020-11-034-3/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ Merge topic 'fix-cuda-qnx'Brad King2020-11-034-3/+9
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Help: Add 3.19 release note about CUDA support on QNXBrad King2020-11-021-0/+2
| | | | | | | |
| * | | | | | | CUDA: Enable support on QNXjanbernloehr2020-11-023-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge branch 'release-3.19'Craig Scott2020-11-030-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'doc-cpack-pre-post-scripts' into release-3.19Craig Scott2020-11-031-16/+28
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ \ \ \ Merge topic 'doc-cpack-pre-post-scripts'Craig Scott2020-11-031-16/+28
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Help: Clarify variables specifying scripts to execute during packagingCraig Scott2020-11-031-16/+28
| | |_|/ / / / / | |/| | | | | | | | | | | | | | Relates: #19077
* | | | | | | | CMake Nightly Date StampKitware Robot2020-11-031-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge branch 'release-3.19'Brad King2020-11-020-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'FindBoost-config-mode' into release-3.19Brad King2020-11-021-2/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 685fa8bec0 FindBoost: Avoid leaking internal Boost_ROOT setting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5445
* | | | | | | Merge topic 'FindBoost-config-mode'Brad King2020-11-021-2/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 685fa8bec0 FindBoost: Avoid leaking internal Boost_ROOT setting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5445
| * | | | | | FindBoost: Avoid leaking internal Boost_ROOT settingBrad King2020-10-301-2/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'fix-test-for-qemu'Kyle Edwards2020-11-021-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c42cfb2e8 test/CMakeLib: make testUVProcessChain work with qemu Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5442
| * | | | | | test/CMakeLib: make testUVProcessChain work with qemuEicke Herbertz2020-10-291-0/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | CMake Nightly Date StampKitware Robot2020-11-021-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-11-011-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2020-10-311-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'custom-command-cleanup'Brad King2020-10-308-97/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | cmGeneratorTarget: Refactor custom command dependency evaluationBrad King2020-10-293-64/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | cmCustomCommandGenerator: Collect genex target references in commandsBrad King2020-10-292-4/+27
| | | | | | | | | | | | | | | | | | | | These will become target-level dependencies.
| * | | | cmCustomCommandGenerator: Add move operationsBrad King2020-10-272-9/+11
| | | | |
| * | | | cmAddCustomCommandCommand: Drop outdated commentBrad King2020-10-271-9/+1
| | | | |
| * | | | cmLocalNinjaGenerator: Remove leftover local debugging commentBrad King2020-10-271-5/+0
| | | | |
| * | | | Remove unnecessary arbitrary CollapseFullPath second argumentsBrad King2020-10-273-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some calls to CollapseFullPath that already have an absolute path were updated by commit 22f38c0d6b (cmake: avoid getcwd in `CollapseFullPath`, 2020-01-14, v3.17.0-rc1~171^2) to pass an arbitrary second argument to prevent unnecessary `getcwd` calls. Since then, the KWSys implementation of CollapseFullPath has learned to avoid unnecessary `getcwd` calls on its own, so we can drop the arbitrary second arguments to our CollapseFullPath calls.
* | | | | Merge branch 'release-3.19'Brad King2020-10-300-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge topic 'CheckSourceRuns-compatibility' into release-3.19Brad King2020-10-307-3/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a524bf3aa7 CheckSourceRuns: do not fail on unrecognized arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5426
* | \ \ \ \ Merge topic 'CheckSourceRuns-compatibility'Brad King2020-10-307-3/+31
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | a524bf3aa7 CheckSourceRuns: do not fail on unrecognized arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5426
| * | | | | CheckSourceRuns: do not fail on unrecognized argumentsBen Boeckel2020-10-287-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'release-3.19'Craig Scott2020-10-300-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'string-json-doc-update' into release-3.19Craig Scott2020-10-301-10/+13
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 49fce3373b Help: Clarify string(JSON) error handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5427
* | | | | | Merge topic 'string-json-doc-update'Craig Scott2020-10-301-10/+13
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 49fce3373b Help: Clarify string(JSON) error handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5427
| * | | | | Help: Clarify string(JSON) error handlingPeter Steneteg2020-10-281-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | Closes: #21355
* | | | | | CMake Nightly Date StampKitware Robot2020-10-301-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'llvm-rc-CMAKE_RC_FLAGS'Brad King2020-10-295-6/+79
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea03f50842 llvm_rc: add llvm_rc option filter to correctly pick up all options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5412
| * | | | | llvm_rc: add llvm_rc option filter to correctly pick up all optionsThomas Bernard2020-10-285-6/+79
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21315