mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-05 05:39:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,391 Commits 2 Branches 401 Tags
3c324689a7a3e16b7f232b943efd4ded971467bf
Commit Graph

50391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Asit Dhal 3c324689a7 include: refactor call sites of cmMakefile::ReadDependentFile 
Fixes: #16773
 2020-10-21 11:20:37 +02:00
Brad King ef9030a94f Merge branch 'release-3.19' 2020-10-20 15:59:20 -04:00
Brad King 9ef8477fe9 Merge topic 'ci-win-python' 
8f7fef629b ci: add Python to PATH on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5403
 2020-10-20 15:59:20 -04:00
Brad King e59c8f548d Merge topic 'ci-win-python' into release-3.19 
8f7fef629b ci: add Python to PATH on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5403
 2020-10-20 15:59:20 -04:00
Brad King 8f7fef629b ci: add Python to PATH on Windows 
Our test suite searches for a Python interpreter to perform some extra
checks.  Our CI base images for Linux have Python available.  Update our
Windows jobs to provide a Python interpreter for our test suite to find
consistently between the build and test steps.
 2020-10-20 15:11:12 -04:00
Kyle Edwards 8bb8c9fb13 Merge branch 'release-3.19' 2020-10-20 11:59:54 -04:00
Kyle Edwards 81c88bb261 Merge topic 'cmake-presets-doc-move' into release-3.19 
4a123fc28c Help: Clarify purpose of warnings and errors
6c74bcfc20 Help: Make architecture and toolset descriptions generic
45766789a0 Help: Add inheritance to CMakePresets.json example
88c9d6f6eb Help: Add documentation for debug field
efab856008 Help: Show environment field
2208db114c Help: Show multiple ways of doing cacheVariables
d30f85193f Help: Move vendor field into example
b9c8c57860 Help: s/unusedVars/unusedCli/
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5373
 2020-10-20 11:59:54 -04:00
Kyle Edwards 54a5c026d0 Merge topic 'cmake-presets-doc-move' 
4a123fc28c Help: Clarify purpose of warnings and errors
6c74bcfc20 Help: Make architecture and toolset descriptions generic
45766789a0 Help: Add inheritance to CMakePresets.json example
88c9d6f6eb Help: Add documentation for debug field
efab856008 Help: Show environment field
2208db114c Help: Show multiple ways of doing cacheVariables
d30f85193f Help: Move vendor field into example
b9c8c57860 Help: s/unusedVars/unusedCli/
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5373
 2020-10-20 11:59:54 -04:00
Brad King 30d2d34611 Merge topic 'nsis-utf-8-bom' 
c92b96234a CPack/NSIS: Template file in UTF-8 BOM to support Unicode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5392
 2020-10-20 09:39:15 -04:00
Brad King 57a29e9d31 Merge branch 'release-3.19' 2020-10-20 09:38:18 -04:00
Brad King 2fb0768dc0 Merge topic 'find_package-check-dir' 
0356b81525 find_package: Fix regression in searching root prefix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5396
 2020-10-20 09:38:18 -04:00
Brad King bb4e2f3f9a Merge topic 'find_package-check-dir' into release-3.19 
0356b81525 find_package: Fix regression in searching root prefix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5396
 2020-10-20 09:38:17 -04:00
Kitware Robot 7bac94e38c CMake Nightly Date Stamp 2020-10-20 00:01:15 -04:00
Johnny Jazeix c92b96234a CPack/NSIS: Template file in UTF-8 BOM to support Unicode 
Fixes: #21318
 2020-10-19 19:53:56 +02:00
Brad King 0356b81525 find_package: Fix regression in searching root prefix 
Fix the check added by commit 2ff1693066 (find_package: avoid showing
files as directories when searching config files, 2020-09-30,
v3.19.0-rc1~67^2) to avoid skipping the root prefix `/`.

Fixes: #21324
 2020-10-19 11:08:49 -04:00
Kyle Edwards 4a123fc28c Help: Clarify purpose of warnings and errors 2020-10-19 10:29:19 -04:00
Kyle Edwards 6c74bcfc20 Help: Make architecture and toolset descriptions generic 2020-10-19 10:29:19 -04:00
Kyle Edwards 45766789a0 Help: Add inheritance to CMakePresets.json example 2020-10-19 10:29:19 -04:00
Brad King c05e561474 Merge topic 'checklanguage-honor-toolchain' 
bddc54a37d CheckLanguage: Pass CMAKE_TOOLCHAIN_FILE to test project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5384
 2020-10-19 10:28:58 -04:00
Brad King e61d872839 Merge topic 'FindPython-support-version-3.10' into release-3.19 
23cd98a66a FindPython: Add support of version 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5383
 2020-10-19 10:28:00 -04:00
Brad King 5f9d41b7e3 Merge branch 'release-3.19' 2020-10-19 10:28:00 -04:00
Brad King 9bda28c7a6 Merge topic 'FindPython-support-version-3.10' 
23cd98a66a FindPython: Add support of version 3.10

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5383
 2020-10-19 10:28:00 -04:00
Brad King b271385c67 Merge branch 'release-3.19' 2020-10-19 10:26:31 -04:00
Brad King bd080f64ba Merge topic 'separate_arguments-no-args' 
747f80fe82 separate_arguments: Fix crash on *_COMMAND with no arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5382
 2020-10-19 10:26:31 -04:00
Brad King f4e6dfe55d Merge topic 'separate_arguments-no-args' into release-3.19 
747f80fe82 separate_arguments: Fix crash on *_COMMAND with no arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5382
 2020-10-19 10:26:30 -04:00
Kyle Edwards 88c9d6f6eb Help: Add documentation for debug field 
Oops!
 2020-10-19 10:25:57 -04:00
Kyle Edwards efab856008 Help: Show environment field 2020-10-19 10:25:57 -04:00
Kyle Edwards 2208db114c Help: Show multiple ways of doing cacheVariables 
This demonstrates both the simple string and the complex object,
and ensures that they get automated testing.
 2020-10-19 10:25:57 -04:00
Kyle Edwards d30f85193f Help: Move vendor field into example 
This ensures that the vendor field gets automated testing from the
example.
 2020-10-19 10:25:57 -04:00
Kyle Edwards b9c8c57860 Help: s/unusedVars/unusedCli/ 
This was a mistake in the documentation.

Fixes: #21303
 2020-10-19 10:25:57 -04:00
Kyle Edwards c436aaaad1 Help: Move CMakePresets.json documentation into a separate file 2020-10-19 10:25:57 -04:00
Brad King 91cc2f1eed Merge branch 'release-3.19' 2020-10-19 10:23:50 -04:00
Brad King ae1ca3034e Merge topic 'doc-CMP0111' into release-3.19 
5c3a91c808 CMP0111: Clarify that the new error is on a missing property setting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Reinking <alex_reinking@berkeley.edu>
Merge-request: !5385
 2020-10-19 10:23:50 -04:00
Brad King 860e40de6b Merge topic 'doc-CMP0111' 
5c3a91c808 CMP0111: Clarify that the new error is on a missing property setting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Reinking <alex_reinking@berkeley.edu>
Merge-request: !5385
 2020-10-19 10:23:50 -04:00
Brad King fd0aab88d5 Merge branch 'release-3.19' 2020-10-19 10:21:58 -04:00
Brad King 30d872d2d1 Merge topic 'sccache-macos-without-timeouts' 
b0fe666846 ci: use a patched sccache on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5394
 2020-10-19 10:21:58 -04:00
Brad King d3d292aa7b Merge topic 'sccache-macos-without-timeouts' into release-3.19 
b0fe666846 ci: use a patched sccache on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5394
 2020-10-19 10:21:57 -04:00
Ben Boeckel b0fe666846 ci: use a patched sccache on macOS 
This version is much less likely to timeout on server startup since it
runs the expensive computation in a background thread.

See https://github.com/mozilla/sccache/pull/868 for the status.
 2020-10-19 09:23:06 -04:00
Kitware Robot c1a214a4f6 CMake Nightly Date Stamp 2020-10-19 00:01:27 -04:00
Kitware Robot 52be712ad8 CMake Nightly Date Stamp 2020-10-18 00:01:13 -04:00
Craig Scott 792863ac29 Merge topic 'cmake-gui-disable-presets' into release-3.19 
d471406f0b CMake GUI: Disable preset fields instead of hiding them

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5374
 2020-10-17 07:13:18 -04:00
Craig Scott b4315cd2df Merge branch 'release-3.19' 2020-10-17 07:13:18 -04:00
Craig Scott b189834d05 Merge topic 'cmake-gui-disable-presets' 
d471406f0b CMake GUI: Disable preset fields instead of hiding them

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5374
 2020-10-17 07:13:18 -04:00
Kitware Robot 7c916e0929 CMake Nightly Date Stamp 2020-10-17 00:01:13 -04:00
Kyle Edwards d471406f0b CMake GUI: Disable preset fields instead of hiding them 2020-10-16 15:16:04 -04:00
Brad King e1d124286a Merge topic 'file-configure-angle-brackets' into release-3.19 
06a9a3bdc3 file(CONFIGURE): Allow angle brackets in content

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5379
 2020-10-16 09:23:42 -04:00
Brad King 424093e83d Merge branch 'release-3.19' 2020-10-16 09:23:42 -04:00
Brad King b824fd5a2e Merge topic 'file-configure-angle-brackets' 
06a9a3bdc3 file(CONFIGURE): Allow angle brackets in content

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5379
 2020-10-16 09:23:42 -04:00
Brad King 284d52eedd Merge branch 'release-3.19' 2020-10-16 09:22:33 -04:00
Brad King 0bdaa60e43 Merge topic 'CheckSource-Fortran' into release-3.19 
c4c636cef5 Tests: Add cases for CheckSource{Compiles,Runs} bad arguments
1e519df025 CheckSource{Runs,Compiles}: Fix default Fortran source extension

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5378
 2020-10-16 09:22:32 -04:00