summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* execute_process: add options for fatal errors on subprocess failureAsit Dhal2020-10-0113-2/+101
| | | | Fixes: #19930
* CMake Nightly Date StampKitware Robot2020-10-011-1/+1
|
* Merge topic 'cmake_language-DEFER'Brad King2020-09-30153-129/+1153
|\ | | | | | | | | | | | | | | | | | | | | | | | | e8b0359a43 cmake_language: Add signature to DEFER calls to later times 9880549405 cmake_language: Make all errors fatal 4f33f3dcff cmake_language(CALL): Accept empty ${var} expansions 4ebe9c4ce1 cmake_language(EVAL): Factor out internal helper 78ff24a3a7 Help: Use singular placeholder name in cmake_language signature edd60d4419 Tests: Simplify RunCMake.cmake_language invalid command cases 1a5bf8245e cmMakefile: Clarify name of internal list file run method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5262
| * cmake_language: Add signature to DEFER calls to later timesBrad King2020-09-29143-25/+1038
| | | | | | | | Fixes: #19575
| * cmake_language: Make all errors fatalBrad King2020-09-291-17/+19
| |
| * cmake_language(CALL): Accept empty ${var} expansionsBrad King2020-09-297-69/+71
| | | | | | | | | | Factor out an internal helper. Generalize partial argument expansion and call the helper on a clean boundary between raw arguments.
| * cmake_language(EVAL): Factor out internal helperBrad King2020-09-291-24/+32
| |
| * Help: Use singular placeholder name in cmake_language signatureBrad King2020-09-291-2/+2
| |
| * Tests: Simplify RunCMake.cmake_language invalid command casesBrad King2020-09-295-17/+16
| |
| * cmMakefile: Clarify name of internal list file run methodBrad King2020-09-292-8/+8
| |
* | Merge topic 'find-package-check-empty-version-range'Craig Scott2020-09-3017-36/+97
|\ \ | | | | | | | | | | | | | | | | | | 212b0afb66 find_package: raise error on empty version range Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5294
| * | find_package: raise error on empty version rangeMarc Chevrier2020-09-2917-36/+97
| | |
* | | Merge topic 'vs-mixed-lang-std'Brad King2020-09-304-0/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b325484928 VS: Fix C language standard in target with C++ sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5295
| * | | VS: Fix C language standard in target with C++ sourcesBrad King2020-09-294-0/+49
| | |/ | |/| | | | | | | | | | | | | Add C-language standard to target-wide C++ settings. Fixes: #21195
* | | Merge topic 'update-kwsys'Brad King2020-09-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2132f2d49b Merge branch 'upstream-KWSys' into update-kwsys eaf37ffde9 KWSys 2020-09-29 (4a19ed43) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5293
| * \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-09-291-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-09-29 (4a19ed43)
| | * | | KWSys 2020-09-29 (4a19ed43)KWSys Upstream2020-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 4a19ed432e73d9720244eb52799c4c0a54172eca (master). Upstream Shortlog ----------------- Deniz Bahadir (1): 8bc06cf8 Regex: Double the maximal allowed size for a regex (to 2^{16}-1)
* | | | | Merge topic 'ci-src-package'Brad King2020-09-306-15/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 448b411d99 gitlab-ci: add a job to upload source packages 45633a6297 gitlab-ci: add a job to make source packages 17decc4691 gitlab-ci: re-organize packaging pipeline Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5297
| * | | | | gitlab-ci: add a job to upload source packagesBrad King2020-09-291-0/+11
| | | | | |
| * | | | | gitlab-ci: add a job to make source packagesBrad King2020-09-295-0/+35
| | | | | |
| * | | | | gitlab-ci: re-organize packaging pipelineBrad King2020-09-293-15/+27
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Move the macOS package build job into the `build` stage. Since it depends on the sphinx doc package job, add a preceding `prep` stage.
* | | | | Merge branch 'release-3.18'Brad King2020-09-300-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'cxx-as-objcxx' into release-3.18Brad King2020-09-305-2/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a2977ba55 OBJCXX: Fix regression for compiling cpp files as objcxx Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5296
* | \ \ \ \ \ Merge topic 'cxx-as-objcxx'Brad King2020-09-305-2/+14
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a2977ba55 OBJCXX: Fix regression for compiling cpp files as objcxx Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5296
| * | | | | | OBJCXX: Fix regression for compiling cpp files as objcxxCristian Adam2020-09-295-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 8d61294c3e (PCH: Mark CMake PCH source files as -x <lang>-header, 2020-09-04, v3.18.3~14^2) we removed the explicit `-x objective-c++` flag. This broke cases with custom source extensions. Restore the explicit `-x objective-c[++]` flag and put it before the `<FLAGS>` placeholder. The latter will contain the proper `-x objective-c[++]-header` value and will override the `-x objective-c[++]` value set before. Fixes: #21234
* | | | | | | Merge branch 'release-3.18'Brad King2020-09-300-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'cuda-11.1-sm86' into release-3.18Brad King2020-09-301-3/+13
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f6b0ba8b1 FindCUDA/select_compute_arch: Add CUDA 11.1 and SM86 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5292
* | | | | | | Merge topic 'cuda-11.1-sm86'Brad King2020-09-301-3/+13
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f6b0ba8b1 FindCUDA/select_compute_arch: Add CUDA 11.1 and SM86 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5292
| * | | | | | FindCUDA/select_compute_arch: Add CUDA 11.1 and SM86 supportzasdfg bnm2020-09-291-3/+13
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-09-301-1/+1
| | | | | | |
* | | | | | | Merge topic 'cmake-gui-environment'Kyle Edwards2020-09-2923-39/+1002
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85f5009d27 CMake GUI: Add environment editor d6c051c126 Tests: Add some basic configure tests for the CMake GUI 7cd95d9996 Tests: Add CatchShow helper for CMake GUI tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5270
| * | | | | | CMake GUI: Add environment editorKyle Edwards2020-09-2817-37/+761
| | | | | | |
| * | | | | | Tests: Add some basic configure tests for the CMake GUIKyle Edwards2020-09-286-0/+92
| | | | | | |
| * | | | | | Tests: Add CatchShow helper for CMake GUI testsKyle Edwards2020-09-285-2/+149
| | | | | | |
* | | | | | | Merge topic 'simplify-execution-context'Brad King2020-09-2911-91/+45
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07c1bdda3d cmMakefile: Replace GetExecutionFilePath with the top of the Backtrace 727ed0c403 cmMakefile: Simplify ExpandArguments signature e456dae669 cmConditionEvaluator: Remove extra copy of execution context 0100a4943e cmMakefile: Remove now-unused overload of GetBacktrace dc49abcb89 if,while: Clarify condition backtrace construction 68af831505 cmMakefile: Inline GetExecutionContext at call sites 280f3918f3 cmMakefile: Simplify GetExecutionContext implementation 0e59b45dfc cmListFileCache: Add explicit constructors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5276
| * | | | | | cmMakefile: Replace GetExecutionFilePath with the top of the BacktraceBrad King2020-09-282-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The execution file path stack and the backtrace stack are kept in sync. At all call sites of `GetExecutionFilePath`, the execution file path matches the path in the context at the top of the backtrace stack.
| * | | | | | cmMakefile: Simplify ExpandArguments signatureBrad King2020-09-284-24/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only call sites that pass the explicit file name argument are in function blocker `ArgumentsMatch` methods for `function` and `macro`. We already ensure that they are balanced within a file scope, and the RAII helpers `BuildsystemFileScope` and `ListFileScope` ensure that the backtrace and execution list file stacks unwind to the matching level. Therefore we can assume that the file name where we are checking for matching arguments matches starting file name where those arguments first appeared, and do not need to pass it explicitly.
| * | | | | | cmConditionEvaluator: Remove extra copy of execution contextBrad King2020-09-284-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The execution context passed to the constructor always matches the top of the backtrace, so the former can be removed in favor of using only the latter.
| * | | | | | cmMakefile: Remove now-unused overload of GetBacktraceBrad King2020-09-282-10/+0
| | | | | | |
| * | | | | | if,while: Clarify condition backtrace constructionBrad King2020-09-282-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Evaluation of the `elseif`, `else`, and `while` commands takes place during function blocker evaluation before any actual command execution takes place. Therefore they do not have an entry in the backtrace stack. Each of their implementations needs to construct an extra backtrace entry to use in error messages and such. Each of them used a slightly different approach due to evolution over time. Clean up their construction of the extra backtrace entry and use a named variable to contain it for clarity.
| * | | | | | cmMakefile: Inline GetExecutionContext at call sitesBrad King2020-09-285-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method only had one line, and its implementation is more clear at the call sites than the method name.
| * | | | | | cmMakefile: Simplify GetExecutionContext implementationBrad King2020-09-281-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method takes the function name and line from the top of the current backtrace and then gets the file path from the state's `GetExecutionListFile`. This exactly matches what the `cmMakefileCall` constructor does to create the top of the current backtrace anyway, so we can just take that directly.
| * | | | | | cmListFileCache: Add explicit constructorsBrad King2020-09-281-0/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | In order to construct with an initializer list in pure C++11, add the explicit constructors.
* | | | | | Merge topic 'ctest_launch_report_make_errors'Brad King2020-09-2914-378/+504
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8b7dd061b ctest: improve Unicode support for launchers ab9ad2a6a0 ctest: report make-level errors to CDash when using launchers 56e4e942d2 ctest: split launcher XML writer into separate class Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Zack Galbreath <zack.galbreath@kitware.com> Merge-request: !5266
| * | | | | | ctest: improve Unicode support for launchersZack Galbreath2020-09-281-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix launcher behavior for international characters in the path on Windows.
| * | | | | | ctest: report make-level errors to CDash when using launchersZack Galbreath2020-09-289-11/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19545
| * | | | | | ctest: split launcher XML writer into separate classZack Galbreath2020-09-285-367/+449
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactor will allow us to more easily add additional warnings and errors to builds that use launchers.
* | | | | | | Merge topic 'refactor-cmprop'Brad King2020-09-292-29/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c88dde2869 cmGeneratorTarget: internal refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5289
| * | | | | | | cmGeneratorTarget: internal refactoringvvs314152020-09-282-29/+27
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'return-cmprop'Brad King2020-09-298-38/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d298ae7470 cmake::GetCacheDefinition: Return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5288