mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-24 23:49:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
50,403 Commits 2 Branches 386 Tags
6d45f951ed0eba8feefc3c5aeeaeed628bf6497c
Commit Graph

7988 Commits

Author SHA1 Message Date
Kyle Edwards
cf6ac2d365 Merge branch 'master' into cmakepresets-schema 2020-10-20 14:51:42 -04:00
Kyle Edwards
e3bce8edf4 Tests: Add JSON schema validation to CMakePresets.json tests 2020-10-20 12:07:09 -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
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
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
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
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
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
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
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
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
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
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
Samir Benmendil
bddc54a37d CheckLanguage: Pass CMAKE_TOOLCHAIN_FILE to test project 
Fixes: #20545
 2020-10-16 09:13:32 -04:00
Robert Bozzetto
747f80fe82 separate_arguments: Fix crash on *_COMMAND with no arguments 
Fixes: #21320
 2020-10-16 08:49:28 -04:00
Brad King
5c3a91c808 CMP0111: Clarify that the new error is on a missing property setting 
The previous wording could be confused with the file missing on disk.
 2020-10-16 08:26:00 -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
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
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
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
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
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
a258d03e33 Merge topic 'FindIntl_use_imported_targets' 
c30d06b7e6 FindIntl: Add imported target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5333
 2020-10-14 11:44:08 -04:00
Sibi Siddharthan
c30d06b7e6 FindIntl: Add imported target 
Fixes: #21271
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-10-13 15:11:40 -04:00
Brad King
2b218883cd Add deprecation warnings for policies CMP0075 and below 
The OLD behaviors of all policies are deprecated, but only by
documentation.  Add an explicit deprecation diagnostic for policies
introduced in CMake 3.12 and below to encourage projects to port
away from setting policies to OLD.
 2020-10-13 14:36:00 -04:00
Kyle Edwards
146e1e6ba1 Ninja: Transform DEPFILEs with policy CMP0116 
Fixes: #21267
 2020-10-13 10:19:46 -04:00
Kyle Edwards
b2c14bc774 cmake -E: Add cmake_transform_depfile internal command 2020-10-13 10:18:02 -04:00
Kyle Edwards
946adadd40 cmGccDepfileReader: Rework helper code 
Fix some of the semantics of the depfile, add error handling, and
refactor cmGccDepfileLexerHelper.
 2020-10-13 10:18:02 -04:00
Kyle Edwards
a1988e4c80 Merge topic 'explicit-source-extensions' 
fd50a75fa0 CMP0115: Require source file extensions to be explicit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5346
 2020-10-13 10:17:14 -04:00
Kyle Edwards
fd50a75fa0 CMP0115: Require source file extensions to be explicit 2020-10-13 09:46:54 -04:00
Brad King
01ae8149b8 Merge topic 'android-verify-abi-in-ndk' into release-3.19 
5c2f9e3eeb Android: Fatal if ABI is not supported by NDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5351
 2020-10-13 08:38:54 -04:00
Brad King
7e0cb5cab8 Merge topic 'android-verify-abi-in-ndk' 
5c2f9e3eeb Android: Fatal if ABI is not supported by NDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5351
 2020-10-13 08:38:54 -04:00
Craig Scott
343c8fe8ab Merge topic 'export-namelink-only' 
64690f6df0 export: Do not fail generation for namelink-only case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5352
 2020-10-12 19:19:33 -04:00
Craig Scott
446874a8a1 Merge topic 'export-namelink-only' into release-3.19 
64690f6df0 export: Do not fail generation for namelink-only case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5352
 2020-10-12 19:19:32 -04:00
Kyle Edwards
9e9447a427 Merge topic 'cmake-presets-documentation-fix' 
94c955e508 Tests: Test the CMakePresets.json example in the documentation
d6af1e83bc Help: Fix documentation of CMakePresets.json's cacheVariables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5353
 2020-10-12 14:04:41 -04:00
Deniz Bahadir
64690f6df0 export: Do not fail generation for namelink-only case 2020-10-09 22:29:22 +02:00
Kyle Edwards
94c955e508 Tests: Test the CMakePresets.json example in the documentation 2020-10-09 15:35:54 -04:00
Haibo Huang
5c2f9e3eeb Android: Fatal if ABI is not supported by NDK 2020-10-09 09:49:19 -04:00
Brad King
c6e4d97425 Merge topic 'iwyu-map-cm-headers' 
06c0d59c17 IWYU: Map <*> headers to <cm/*> headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5327
 2020-10-09 09:40:04 -04:00
Brad King
3fb2112880 Merge topic 'iwyu-map-cm-headers' into release-3.19 
06c0d59c17 IWYU: Map <*> headers to <cm/*> headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5327
 2020-10-09 09:40:03 -04:00
Brad King
5f2e1f2f3d Merge topic 'GNUInstallDirs-debian' into release-3.19 
798c1c3192 GNUInstallDirs: Comply with Debian Policy on LIBEXECDIR
75bcd3cf54 Tests: Add RunCMake.GNUInstallDirs expected output specific to Debian

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5349
 2020-10-09 09:38:20 -04:00