mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 03:29:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
51,882 Commits 2 Branches 401 Tags
0ee997b1323a6f8f3cbe0eecea558adc494c3fb0
Commit Graph

51882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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
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 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
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 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
Gregor Jasny dc7b6c2c06 DetermineCompiler: Fix copy-paste error in Intel Compiler detection 
Fixes: #21561
Fixes: a90d2a9eed (IntelLLVM: Add support for Intel LLVM-based compilers, 2020-11-02)
 2021-02-17 08:23:45 +01:00
Brad King 50fc9d5b45 CMake 3.20.0-rc1 v3.20.0-rc1 2021-02-16 12:11:10 -05:00
Brad King 800e9ce147 Merge branch 'release-3.19' into release-3.20 2021-02-16 12:08:16 -05:00
Brad King 67079c2a89 Merge topic 'FindPython-fix-variable-handling' into release-3.20 
754f4f6876 FindPython: fix erroneous variable handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5816
 2021-02-16 12:07:17 -05:00
Brad King 8289dd75ad Merge branch 'release-3.19' into release-3.20 2021-02-16 12:06:02 -05:00
Brad King f4efda4698 Merge branch 'FindPython-fix-variable-handling' into release-3.19 
Merge-request: !5816
 2021-02-16 10:48:10 -05:00
Marc Chevrier 754f4f6876 FindPython: fix erroneous variable handling 
Fixes: #21817
 2021-02-16 10:46:28 -05:00
Brad King 67835d9a15 Merge topic 'preset-fixes' into release-3.20 
121d602923 presets: Inherit 'quiet' property for test presets
7fd6bb6895 presets: Remove unintended rerunFailed option from test presets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5808
 2021-02-16 10:42:27 -05:00
Brad King e6d6cf9022 Merge topic 'FindPNG-advanced-variables' into release-3.20 
17ae4e1bef FindPNG: only mark used variables as advanced

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5809
 2021-02-16 10:41:26 -05:00
Brad King 516c0736e8 Merge topic 'IntelLLVM-unused-C17' into release-3.20 
4642c81c72 IntelLLVM: Remove incomplete C17 support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5805
 2021-02-16 10:40:29 -05:00
Brad King d5401de605 CMake 3.19.5 v3.19.5 2021-02-15 11:48:33 -05:00
Sam Freed 121d602923 presets: Inherit 'quiet' property for test presets 
This was missed in the original implementation.
 2021-02-15 10:52:32 -05:00
Sam Freed 7fd6bb6895 presets: Remove unintended rerunFailed option from test presets 
This was accidentally included after discussion in #21391 had decided to
leave it out.  It was never included in a release.

Issue: #21391
 2021-02-15 10:52:32 -05:00
Brad King 4642c81c72 IntelLLVM: Remove incomplete C17 support 
CMake does not yet model support for C17.  Avoid possible confusion by
removing the settings for IntelLLVM pending a full implementation.
 2021-02-15 10:43:35 -05:00
Ben Boeckel 17ae4e1bef FindPNG: only mark used variables as advanced 
The `PNG_LIBRARY` variable is an output and not a cache variable.

Fixes some CMP0102 warnings.
 2021-02-15 10:33:01 -05:00
Brad King 7f2203ab4a Merge topic 'release-3.20-cleanups' into release-3.20 
7c147b21c7 Help: Add Ninja Multi-Config and make generator types into links
5039ca1126 Help: Convert output directory variable mentions to cross-references
1a7e51b9d5 Help: Cleanup wording and links in 3.20 release notes
d16830324f CPackIFW: Improve warning and docs for show page list option
7ed7db88a4 CPackIFW: Fix cppcheck warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5810
 2021-02-15 10:32:20 -05:00
Brad King c1e90c5544 Merge topic 'cuda-nvcc-output' into release-3.20 
9ea66b2d86 CUDA: Capture all nvcc output when extracting toolkit root

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Tested-by: Raul Tambre <raul@tambre.ee>
Acked-by: Rong Ou <rong.ou@gmail.com>
Merge-request: !5804
 2021-02-15 10:29:24 -05:00
Brad King 26eae560ff Merge topic 'FindGDAL-improvements' into release-3.20 
55e493928b FindGDAL: add release note
f4b53fadda FindGDAL: support finding additional GDAL library names
1b2774450d FindGDAL: add support for skipping gdal-config
1621cb3eb1 FindGDAL: add documentation to cache variables
3caaff4c08 FindGDAL: conditionally set the output variables
3f6a4f2062 FindGDAL: mark cache variables as advanced
02e906305d FindGDAL: use execute_process instead of exec_program
140344da14 FindGDAL: fix some indentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5799
 2021-02-15 10:21:18 -05:00
Brad King 4ef7c3670b Merge branch 'release-3.19' into release-3.20 2021-02-15 10:15:18 -05:00
Brad King e0d9d6c06b Merge topic 'relnote-IOS_INSTALL_COMBINED-xcode12' into release-3.20 
cd80f3905f Help: Add 3.19.5 release notes for Xcode iOS-related changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5811
 2021-02-15 10:12:48 -05:00
Brad King 9c3e324259 Merge branch 'relnote-IOS_INSTALL_COMBINED-xcode12' into release-3.19 
Merge-request: !5811
 2021-02-15 10:12:02 -05:00
Craig Scott cd80f3905f Help: Add 3.19.5 release notes for Xcode iOS-related changes 2021-02-14 18:28:56 +11:00
Craig Scott 7c147b21c7 Help: Add Ninja Multi-Config and make generator types into links 2021-02-14 15:41:49 +11:00
Craig Scott 5039ca1126 Help: Convert output directory variable mentions to cross-references 2021-02-14 15:39:29 +11:00
Craig Scott 1a7e51b9d5 Help: Cleanup wording and links in 3.20 release notes 2021-02-14 15:37:55 +11:00
Craig Scott d16830324f CPackIFW: Improve warning and docs for show page list option 2021-02-14 15:33:45 +11:00
Craig Scott 7ed7db88a4 CPackIFW: Fix cppcheck warnings 
The cppcheck warnings about uninitialised variables are likely harmless,
since they are initialised in ParseResource() anyway. Fix the warnings
anyway to reduce linting noise. The warning about a single argument
non-explicit constructor is worth fixing in general.
 2021-02-14 15:24:25 +11:00
Ben Boeckel 55e493928b FindGDAL: add release note 2021-02-12 07:43:23 -05:00
Ben Boeckel f4b53fadda FindGDAL: support finding additional GDAL library names 2021-02-12 07:43:23 -05:00
Brad King 9ea66b2d86 CUDA: Capture all nvcc output when extracting toolkit root 
Since commit fb2afef620 (CUDA: Support nvcc symlinking to ccache,
2021-01-07) and commit 3cef91a321 (CUDA: Always extract CUDA Toolkit
root from nvcc verbose output, 2021-02-03) we always run the command
`nvcc -v __cmake_determine_cuda` to look for the toolkit root in its
stderr.  On Windows, that command may print to stdout instead, so
capture that as well.
 2021-02-12 07:23:48 -05:00
Brad King 36b0cc7958 Merge topic 'Help-MSVC_IDE-avail-notice' into release-3.20 
cf22237c69 Help: clarify availability of the MSVC_IDE variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5800
 2021-02-12 06:54:35 -05:00
Brad King a86cd9cb3c Merge topic 'FindMPI-lang-reason' into release-3.20 
8251b62ba0 FindMPI: Fix reason for a non-enabled non-requested language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5801
 2021-02-12 06:53:41 -05:00
Brad King ea11c13259 Merge topic 'iar-stm8-compiler-support' into release-3.20 
8ee933900e IAR: add support for the STM8 compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5796
 2021-02-12 06:52:27 -05:00
Felipe Torrezan 8ee933900e IAR: add support for the STM8 compiler 2021-02-12 06:51:05 -05:00
Brad King faec25c198 Merge branch 'release-3.19' into release-3.20 2021-02-11 10:08:58 -05:00
Brad King 79c89f6a95 Merge branch 'release-3.18' into release-3.19 2021-02-11 10:08:46 -05:00
Ben Boeckel 1b2774450d FindGDAL: add support for skipping gdal-config 
This can be confusing if there are autotools and CMake-built GDAL builds
within the same environment as the autotools variant will always be
preferred.
 2021-02-11 09:46:10 -05:00
Ben Boeckel 1621cb3eb1 FindGDAL: add documentation to cache variables 2021-02-11 09:46:10 -05:00