summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | CMake Nightly Date StampKitware Robot2020-10-291-1/+1
| | | | | |
* | | | | | Merge topic 'update-vim-syntax'Brad King2020-10-282-16/+758
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntaxBrad King2020-10-282-16/+758
| |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | * upstream-vim-cmake-syntax: vim-cmake-syntax 2020-10-28 (bcc3a97a)
| * | | | | | vim-cmake-syntax 2020-10-28 (bcc3a97a)vim-cmake-syntax upstream2020-10-282-11/+778
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge branch 'release-3.19' into masterBrad King2020-10-280-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | CMake 3.19.0-rc2v3.19.0-rc2Brad King2020-10-281-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.19'Brad King2020-10-280-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge topic 'cmake-presets-help-flag' into release-3.19Brad King2020-10-283-3/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c619be2784 ccmake: Don't list --preset in --help Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5428
* | \ \ \ \ \ \ Merge topic 'cmake-presets-help-flag'Brad King2020-10-283-3/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c619be2784 ccmake: Don't list --preset in --help Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5428
| * | | | | | | ccmake: Don't list --preset in --helpKyle Edwards2020-10-273-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And show available options in cmake-gui. Fixes: #21313
* | | | | | | | Merge branch 'release-3.19'Brad King2020-10-280-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'cmake_path-update-doc' into release-3.19Brad King2020-10-281-122/+127
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec5951e078 cmake_path: Enhance documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5425
* | \ \ \ \ \ \ \ Merge topic 'cmake_path-update-doc'Brad King2020-10-281-122/+127
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec5951e078 cmake_path: Enhance documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5425
| * | | | | | | | cmake_path: Enhance documentationMarc Chevrier2020-10-261-122/+127
| | | | | | | | |
* | | | | | | | | Merge topic 'xcode_build_jobs'Brad King2020-10-282-8/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e794509faa XCode: Use -j build option when job capacity is specified by user Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5429
| * | | | | | | | | XCode: Use -j build option when job capacity is specified by userFred Baksik2020-10-262-8/+7
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18304
* | | | | | | | | Merge branch 'release-3.19'Brad King2020-10-280-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'cmake-gui-manual-argument' into release-3.19Brad King2020-10-283-14/+26
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef03124237 CMake GUI: Add --browse-manual argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5417
* | \ \ \ \ \ \ \ \ Merge topic 'cmake-gui-manual-argument'Brad King2020-10-283-14/+26
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef03124237 CMake GUI: Add --browse-manual argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5417
| * | | | | | | | | CMake GUI: Add --browse-manual argumentKyle Edwards2020-10-273-14/+26
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'aix_makefile_build_jobs'Brad King2020-10-281-3/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4c7d44d82 Makefiles: Use -j option as "-jN" and not "-j N" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5431
| * | | | | | | | | Makefiles: Use -j option as "-jN" and not "-j N"Fred Baksik2020-10-261-3/+4
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21090
* | | | | | | | | Merge branch 'release-3.18' into masterBrad King2020-10-280-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'FindRuby-restore-VENDORLIB_DIR' into release-3.18Brad King2020-10-271-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !5434
* | \ \ \ \ \ \ \ \ \ Merge branch 'release-3.19'Brad King2020-10-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'FindRuby-restore-VENDORLIB_DIR' into release-3.19Brad King2020-10-281-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80e693152c Merge branch 'release-3.19' into FindRuby-restore-VENDORLIB_DIR 4c0ef57e8c FindRuby: Restore compatibility variable RUBY_VENDORLIB_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5434
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'FindRuby-restore-VENDORLIB_DIR'Brad King2020-10-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80e693152c Merge branch 'release-3.19' into FindRuby-restore-VENDORLIB_DIR 4c0ef57e8c FindRuby: Restore compatibility variable RUBY_VENDORLIB_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5434
| * | | | | | | | | | | Merge branch 'release-3.19' into FindRuby-restore-VENDORLIB_DIRBrad King2020-10-273670-16914/+57155
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | / / / / / / | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | FindRuby: Restore compatibility variable RUBY_VENDORLIB_DIRBrad King2020-10-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e672db628b (FindRuby: Rename variables to match case of module name, 2020-03-11, v3.18.0-rc1~546^2), the result variables named with the old `RUBY_` prefix are provided by compatibility code that maps from the new `Ruby_` prefix variables. This variable was accidentally left out. Fixes: #21369
* | | | | | | | | | | Merge branch 'release-3.19'Brad King2020-10-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |