Commit Graph

51981 Commits

Author SHA1 Message Date
Kitware Robot
894e5548a8 CMake Nightly Date Stamp 2021-02-20 00:01:14 -05:00
Brad King
f3ce32969d Merge branch 'release-3.20' 2021-02-19 09:42:21 -05:00
Brad King
48410610a6 Merge branch 'release-3.19' into release-3.20 2021-02-19 09:42:14 -05:00
Brad King
23bc497f10 Merge branch 'release-3.19' 2021-02-19 09:41:28 -05:00
Brad King
b3e39a133f Merge topic 'list-index-arg-parsing'
79eaa908dc cmListCommand: add a policy for failing on invalid indicies
1f1fdff7fa cmListCommand: prefer strtol to atoi
9934a97642 cmListCommand: refactor out index argument parsing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Merge-request: !5817
2021-02-19 09:40:28 -05:00
Brad King
020d8c85e2 Merge topic 'intel-fortran-preprocess' into release-3.20
c9244f369a IntelLLVM: Make explicit Fortran preprocessing under Ninja more robust
056d4bf528 Merge branch 'backport-intel-fortran-preprocess'
af074c266e Intel: Make explicit Fortran preprocessing under Ninja more robust

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5826
2021-02-19 09:35:18 -05:00
Brad King
0fc50fe2a2 Merge branch 'release-3.20' 2021-02-19 09:35:18 -05:00
Brad King
b3822e6508 Merge topic 'intel-fortran-preprocess'
c9244f369a IntelLLVM: Make explicit Fortran preprocessing under Ninja more robust
056d4bf528 Merge branch 'backport-intel-fortran-preprocess'
af074c266e Intel: Make explicit Fortran preprocessing under Ninja more robust

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5826
2021-02-19 09:35:18 -05:00
Brad King
c8ff06a1f8 Merge topic 'docpreset' into release-3.20
87b170d9f9 Help: Add build and test preset to examples in cmake-presets(7)
3f8cf006cb Help: Clarify preset name conflict rules in cmake-presets(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5823
2021-02-19 09:34:35 -05:00
Brad King
80f5ee2d6a Merge branch 'release-3.20' 2021-02-19 09:34:35 -05:00
Brad King
3412d95bf7 Merge topic 'docpreset'
87b170d9f9 Help: Add build and test preset to examples in cmake-presets(7)
3f8cf006cb Help: Clarify preset name conflict rules in cmake-presets(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5823
2021-02-19 09:34:35 -05:00
Brad King
7021e30bce Merge branch 'release-3.20' 2021-02-19 09:33:33 -05:00
Brad King
5f32d8a4e1 Merge topic 'llvm-nm-cleanup' into release-3.20
06e5077688 bindexplib: remove stray debugging output when using llvm-nm

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5828
2021-02-19 09:33:32 -05:00
Brad King
fe727ee2f9 Merge topic 'llvm-nm-cleanup'
06e5077688 bindexplib: remove stray debugging output when using llvm-nm

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5828
2021-02-19 09:33:32 -05:00
Kitware Robot
772c32831f CMake Nightly Date Stamp 2021-02-19 00:01:14 -05:00
Brad King
4b806d390c Merge branch 'release-3.20' 2021-02-18 15:12:31 -05:00
Brad King
bc94ff7945 Merge topic 'doc-if-links'
22140f7af3 Help: Add internal links to if() docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5824
2021-02-18 15:12:31 -05:00
Brad King
0ee997b132 Merge topic 'doc-if-links' into release-3.20
22140f7af3 Help: Add internal links to if() docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5824
2021-02-18 15:12:30 -05:00
Michael Hirsch
87b170d9f9 Help: Add build and test preset to examples in cmake-presets(7)
Co-Author: Brad King <brad.king@kitware.com>
2021-02-18 14:53:28 -05:00
Michael Hirsch
3f8cf006cb Help: Clarify preset name conflict rules in cmake-presets(7) 2021-02-18 14:53:28 -05:00
Brad King
43e2ec018c Merge branch 'release-3.20' 2021-02-18 14:52:26 -05:00
Brad King
98ae005137 Merge topic 'preset-json-comments' into release-3.20
8f1e607ed9 Help: Document JSON comment support in cmake-presets(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5830
2021-02-18 14:52:26 -05:00
Brad King
b8e4e524d3 Merge topic 'preset-json-comments'
8f1e607ed9 Help: Document JSON comment support in cmake-presets(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5830
2021-02-18 14:52:26 -05:00
Brad King
af91c602fe Merge topic 'doc-presets' into release-3.20
47ab2d4d2e Help: Clarify role of binaryDir inheritance in cmake-presets(7)
0e3c361f77 Help: Link to tool-specific preset arguments from cmake-presets(7)
dd6165fbd4 Help: Mention version 2 in cmake-presets(7)
cdbd1ae64b Utilities/Sphinx: Avoid converting -- to an en-dash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5829
2021-02-18 14:35:36 -05:00
Brad King
ff78927e70 Merge branch 'release-3.20' 2021-02-18 14:35:36 -05:00
Brad King
91b4c27d8a Merge topic 'doc-presets'
47ab2d4d2e Help: Clarify role of binaryDir inheritance in cmake-presets(7)
0e3c361f77 Help: Link to tool-specific preset arguments from cmake-presets(7)
dd6165fbd4 Help: Mention version 2 in cmake-presets(7)
cdbd1ae64b Utilities/Sphinx: Avoid converting -- to an en-dash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5829
2021-02-18 14:35:36 -05:00
Michael Hirsch
8f1e607ed9 Help: Document JSON comment support in cmake-presets(7) 2021-02-18 11:47:40 -05:00
Brad King
47ab2d4d2e Help: Clarify role of binaryDir inheritance in cmake-presets(7)
Suggested-by: Michael Hirsch
2021-02-18 11:01:29 -05:00
Brad King
0e3c361f77 Help: Link to tool-specific preset arguments from cmake-presets(7)
Fixes: #21835
2021-02-18 10:55:10 -05:00
Brad King
dd6165fbd4 Help: Mention version 2 in cmake-presets(7)
Version 2 is required for build and test presets.

Fixes: #21829
2021-02-18 10:55:10 -05:00
Brad King
cdbd1ae64b Utilities/Sphinx: Avoid converting -- to an en-dash 2021-02-18 10:55:09 -05:00
Michael Hirsch, Ph.D
22140f7af3 Help: Add internal links to if() docs 2021-02-18 10:20:34 -05:00
Brad King
af1ec83651 Merge topic 'ci-windows-tests'
15f0da341f ci: Enable IPO and FindOpenGL tests on Windows+MSVC+Ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5827
2021-02-18 09:58:34 -05:00
Brad King
06e5077688 bindexplib: remove stray debugging output when using llvm-nm
Remove a debugging message left by commit c856d4556b (bindexplib:
supporting llvm bitcode formats using llvm-nm, 2019-08-13,
v3.16.0-rc1~161^2~1).
2021-02-18 09:37:21 -05:00
Brad King
15f0da341f ci: Enable IPO and FindOpenGL tests on Windows+MSVC+Ninja
These are expected to work under a normal VS installation.
2021-02-18 08:31:29 -05:00
Ben Boeckel
79eaa908dc cmListCommand: add a policy for failing on invalid indicies 2021-02-18 08:30:55 -05:00
Ben Boeckel
1f1fdff7fa cmListCommand: prefer strtol to atoi
This allows for detecting errors.
2021-02-18 08:30:55 -05:00
Brad King
4388c3f717 Merge topic 'DOC-SelectLibraryConfiguration'
b6445ddeda Help: Add SelectLibraryConfigurations example to cmake-developer(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !5815
2021-02-18 08:21:50 -05:00
Brad King
1939510ecb Merge branch 'release-3.20' 2021-02-18 08:19:46 -05:00
Brad King
94408da2a7 Merge topic 'fix-intel-compiler-check' into release-3.20
dc7b6c2c06 DetermineCompiler: Fix copy-paste error in Intel Compiler detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5818
2021-02-18 08:19:45 -05:00
Brad King
1af93f93df Merge topic 'fix-intel-compiler-check'
dc7b6c2c06 DetermineCompiler: Fix copy-paste error in Intel Compiler detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5818
2021-02-18 08:19:45 -05:00
Brad King
759923420b Merge branch 'backport-intel-fortran-preprocess' into release-3.19
Merge-request: !5826
2021-02-18 08:13:49 -05:00
Craig Scott
b942a0aae5 Merge branch 'release-3.20' 2021-02-18 07:39:24 -05:00
Craig Scott
eefcf2e0a6 Merge topic 'fetchcontent-patch-step-typo' into release-3.20
bd876f3849 FetchContent: Restore patch command support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5822
2021-02-18 07:39:23 -05:00
Craig Scott
cb2dc8207c Merge topic 'fetchcontent-patch-step-typo'
bd876f3849 FetchContent: Restore patch command support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5822
2021-02-18 07:39:23 -05:00
Brad King
c9244f369a IntelLLVM: Make explicit Fortran preprocessing under Ninja more robust
Tell the Fortran compiler to write preprocessor output directly to a
file, as we do for the GNU compiler.  The previous "redirect stdout"
approach could break during ABI detection with some `mpif90` wrappers
that add version information to stdout when called with `-v`.

Issue: #21828
2021-02-18 07:36:32 -05:00
Brad King
056d4bf528 Merge branch 'backport-intel-fortran-preprocess' 2021-02-18 07:35:35 -05:00
Brad King
af074c266e Intel: Make explicit Fortran preprocessing under Ninja more robust
Tell the Fortran compiler to write preprocessor output directly to a
file, as we do for the GNU compiler.  The previous "redirect stdout"
approach could break during ABI detection with some `mpif90` wrappers
that add version information to stdout when called with `-v`.

Fixes: #21828
2021-02-18 07:35:12 -05:00
Kitware Robot
b8762f3189 CMake Nightly Date Stamp 2021-02-18 00:01:15 -05:00
Craig Scott
bd876f3849 FetchContent: Restore patch command support
The refactoring in 17e5516e60 (FetchContent: Invoke steps directly and
avoid a separate sub-build, 2021-01-29) contained a typo which resulted
in any PATCH_COMMAND being ignored. Fix the typo and add a test case
that would have caught the regression.
2021-02-18 09:40:39 +11:00