mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
51,954 Commits 2 Branches 401 Tags
bc94ff79452a40b6bf734f9e2b6046d23ea9d5b3
Commit Graph

51954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 43e2ec018c Merge branch 'release-3.20' 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 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 ff78927e70 Merge branch 'release-3.20' 2021-02-18 14:35:36 -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 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 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
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
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
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
Johan Andruejol b6445ddeda Help: Add SelectLibraryConfigurations example to cmake-developer(7) 2021-02-17 14:27:52 -05:00
Brad King 88313686b7 Merge topic 'autouic-missed-ui-dependency' 
4f577d9f3a AUTOUIC: Fix missed ui files in Ninja deps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5806
 2021-02-17 07:05:47 -05: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
Kitware Robot 0abf89bf22 CMake Nightly Date Stamp 2021-02-17 00:01:14 -05:00
Brad King 13ec2e33d2 Merge branch 'release-3.20' 2021-02-16 13:20:02 -05:00
Brad King 50fc9d5b45 CMake 3.20.0-rc1 v3.20.0-rc1 2021-02-16 12:11:10 -05:00
Brad King 969cc89ed9 Merge branch 'release-3.20' 2021-02-16 12:08:22 -05:00
Brad King 800e9ce147 Merge branch 'release-3.19' into release-3.20 2021-02-16 12:08:16 -05:00
Brad King bc7960fa74 Merge branch 'release-3.19' 2021-02-16 12:08:09 -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 aafeaddd62 Merge branch 'release-3.20' 2021-02-16 12:07:17 -05:00
Brad King fc76273519 Merge topic 'FindPython-fix-variable-handling' 
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 234a6dffb8 Merge branch 'release-3.20' 2021-02-16 12:06:24 -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 4dc4a2b460 Merge topic 'tests_home' 
905d663961 Tests: Fake home directory even if not set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5813
 2021-02-16 10:44:56 -05:00
Brad King ae83d2b5ff Merge topic 'cuda_cleanup' 
af38d5a1d4 Platform/Windows-NVIDIA-CUDA: Remove duplicated code
4dc1c9e525 CUDA: Fix spelling __IMPLICT_ -> __IMPLICIT_
4620cf77f2 Clang: Remove unused CUDA implicit link variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5812
 2021-02-16 10:44:24 -05:00
Brad King 255e2a4740 Merge branch 'release-3.20' 2021-02-16 10:42:28 -05:00
Brad King c86ac240ff Merge topic 'preset-fixes' 
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: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 35aeb6e5be Merge branch 'release-3.20' 2021-02-16 10:41:26 -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 13992723d8 Merge topic 'FindPNG-advanced-variables' 
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 1e72d67ea2 Merge branch 'release-3.20' 2021-02-16 10:40:29 -05:00