mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 21:09:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,353 Commits 2 Branches 393 Tags
fd0aab88d561b9c323e3ffcd763df6f2b1d254f5
Commit Graph

50353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brad King
ce11bace37 Merge topic 'CheckSource-Fortran' 
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
Brad King
39b964272c Merge topic 'iar-obj-declutter' into release-3.19 
b357f78196 IAR: Use .o object file extension with IAR-Ilink toolchains

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5380
 2020-10-16 09:21:19 -04:00
Brad King
b2d22b3fa0 Merge branch 'release-3.19' 2020-10-16 09:21:19 -04:00
Brad King
46ba79089d Merge topic 'iar-obj-declutter' 
b357f78196 IAR: Use .o object file extension with IAR-Ilink toolchains

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5380
 2020-10-16 09:21:19 -04:00
Brad King
a11ea1a9ee Merge topic 'fix-refactor-generator-configs' into release-3.19 
b9cb1d324d Fix regression in test/install/package configuration selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5381
 2020-10-16 09:19:48 -04:00
Brad King
90571e57ca Merge branch 'release-3.19' 2020-10-16 09:19:48 -04:00
Brad King
3b9492204a Merge topic 'fix-refactor-generator-configs' 
b9cb1d324d Fix regression in test/install/package configuration selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5381
 2020-10-16 09:19:48 -04:00
Kitware Robot
eee8fc40c9 CMake Nightly Date Stamp 2020-10-16 00:01:14 -04:00
Felipe Torrezan
b357f78196 IAR: Use .o object file extension with IAR-Ilink toolchains 
The compiler default extension for its objects is `.o`.
Prefer that over `.obj`.
 2020-10-15 11:49:39 -04:00
Brad King
b9cb1d324d Fix regression in test/install/package configuration selection 
In commit 7a969fe21d (cmMakefile: Refactor API to better handle empty
config values, 2020-06-30, v3.19.0-rc1~567^2), calls to
`GetGeneratorConfigs` that pass `OnlyMultiConfig` only want to get any
configurations listed if the generator is multi-config.  Fix the
implementation to actually do that.

Fixes: #21316
 2020-10-15 10:53:09 -04:00
Brad King
c4c636cef5 Tests: Add cases for CheckSource{Compiles,Runs} bad arguments 2020-10-15 09:42:56 -04:00
Cristian Adam
06a9a3bdc3 file(CONFIGURE): Allow angle brackets in content 
Fixes: #21306
 2020-10-15 15:42:21 +02:00
Michael Hirsch
1e519df025 CheckSource{Runs,Compiles}: Fix default Fortran source extension 
In commit 357e2ef429 (CheckSoureRuns: Add a unified way to check if a
source runs, 2020-09-14, v3.19.0-rc1~118^2), the default Fortran source
file extension was accidentally changed from `.F90` to `.F`.  Fix that.

In commit 10ae907de0 (CheckSoureCompiles: Add a unified way to check if
a source compiles, 2020-09-14, v3.19.0-rc1~118^2~1), the default Fortran
source extension was correctly preserved as `.F`, but `.F90` is a better
default both for consistency and modern usage.  Use that for direct
calls to the `check_source_compiles` macro.  Update our original
`check_fortran_source_compiles` implementation to use `.F` by default
as it did before.

Fixes: #21307
 2020-10-15 09:33:59 -04:00
Brad King
4f6fccd861 Merge topic 'remove-server-mode' 
9952ee063a server: remove deprecated 'cmake -E server' mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5370
 2020-10-15 08:31:47 -04:00
Brad King
6f84cc7f8b Merge branch 'release-3.18' into master 2020-10-15 08:12:37 -04:00
Brad King
7c0de4175b Merge branch 'cmake-E-cat-binary' into release-3.18 
Merge-request: !5364
 2020-10-15 08:11:56 -04:00
Brad King
6de4ba1547 Merge branch 'release-3.19' 2020-10-15 08:10:51 -04:00
Brad King
9493532f80 Merge topic 'cmake-E-cat-binary' 
f7a5f28318 cmake: Fix '-E cat' command for binary files on Windows
90b39a5209 cmConsoleBuf: Factor out cout/cerr console buffer management
f1fdd15863 clang-format: Fix include block order in ctest.cxx and cpack.cxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5364
 2020-10-15 08:10:51 -04:00
Brad King
b1d9a25f35 Merge topic 'cmake-E-cat-binary' into release-3.19 
f7a5f28318 cmake: Fix '-E cat' command for binary files on Windows
90b39a5209 cmConsoleBuf: Factor out cout/cerr console buffer management
f1fdd15863 clang-format: Fix include block order in ctest.cxx and cpack.cxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5364
 2020-10-15 08:10:50 -04:00
Kitware Robot
64449c9f94 CMake Nightly Date Stamp 2020-10-15 00:01:13 -04:00
Brad King
9952ee063a server: remove deprecated 'cmake -E server' mode 
The server mode has been deprecated since commit 996e1885c4 (server:
deprecate in favor of the file-api, 2019-04-19, v3.15.0-rc1~198^2).
Clients should now be using the file-api.  Remove the server mode.
 2020-10-14 16:41:50 -04:00
Brad King
66716b875f Merge branch 'release-3.19' 2020-10-14 15:45:10 -04:00
Brad King
e98b636e17 Merge topic 'bootstrap-make-smake' 
8e7ece1416 bootstrap: add smake as known make processors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5372
 2020-10-14 15:45:10 -04:00
Brad King
30643e21d4 Merge topic 'bootstrap-make-smake' into release-3.19 
8e7ece1416 bootstrap: add smake as known make processors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5372
 2020-10-14 15:45:09 -04:00
Brad King
c1979771eb Merge branch 'release-3.19' 2020-10-14 15:44:21 -04:00
Brad King
a532268eef Merge topic 'bootstrap-ninja-samu' into release-3.19 
f0ac977d3c bootstrap: add samu as known ninja processors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5371
 2020-10-14 15:44:21 -04:00
Brad King
9da8009f20 Merge topic 'bootstrap-ninja-samu' 
f0ac977d3c bootstrap: add samu as known ninja processors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5371
 2020-10-14 15:44:21 -04:00
Issam E. Maghni
8e7ece1416 bootstrap: add smake as known make processors 
As found in “Modules/CMakeUnixFindMake.cmake”
 2020-10-14 15:29:25 -04:00
Issam E. Maghni
f0ac977d3c bootstrap: add samu as known ninja processors 
As found in “Modules/CMakeNinjaFindMake.cmake”
 2020-10-14 15:28:50 -04:00
Johnny Jazeix
f7a5f28318 cmake: Fix '-E cat' command for binary files on Windows 
Reset `std::cout` to write in binary mode with no encoding conversions.

Co-Author: Brad King <brad.king@kitware.com>
Fixes: #21295
 2020-10-14 12:08:07 -04:00
Brad King
90b39a5209 cmConsoleBuf: Factor out cout/cerr console buffer management 2020-10-14 12:08:06 -04:00
Brad King
f1fdd15863 clang-format: Fix include block order in ctest.cxx and cpack.cxx 2020-10-14 12:06:50 -04:00
Brad King
c555959717 Merge topic 'ninja-depfile-transformation' 
146e1e6ba1 Ninja: Transform DEPFILEs with policy CMP0116
596439b1bb cmCustomCommandGenerator: Add option to transform depfile
b2c14bc774 cmake -E: Add cmake_transform_depfile internal command
946adadd40 cmGccDepfileReader: Rework helper code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5325
 2020-10-14 11:49:51 -04:00
Brad King
609f2a1406 Merge topic 'ninja-multi-no-cache-variables' 
297ab15bf6 Ninja Multi-Config: Read configuration variables as normal variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5360
 2020-10-14 11:49:16 -04:00