mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 22:31:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,444 Commits 2 Branches 401 Tags
d22a760cb9f839eefb56051482dbb5f589ee9ff7
Commit Graph

29737 Commits

Author SHA1 Message Date
Kitware Robot d22a760cb9 CMake Nightly Date Stamp 2020-10-26 00:01:06 -04:00
Kitware Robot d749d46814 CMake Nightly Date Stamp 2020-10-25 00:01:04 -04:00
Kitware Robot a8e9208f70 CMake Nightly Date Stamp 2020-10-24 00:01:19 -04:00
Brad King 5988a4deea Merge topic 'no-override-flow-control' 
8aee7fdb32 cmState: Prohibit override of flow control commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5409
 2020-10-23 09:06:03 -04:00
Brad King 31848e35a7 Merge topic 'proper-command-nesting' 
12f6e37eb7 cmListFileCache: Enforce proper nesting of flow control statements
67383725bd cm::optional: Add constructor delegation to nullopt_t constructor
0668120398 cm::optional: Fix move assignment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5401
 2020-10-23 09:05:13 -04:00
Brad King bc0c72f1f0 Merge topic 'vs-fortran-debugging-flags' 
8ad6fabfc5 VS: Remove flag table entries for Fortran /Z* flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5406
 2020-10-23 08:44:48 -04:00
Craig Scott dbd1d737f9 Merge topic 'cmake-presets-toolset-arch-config' 
64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5387
 2020-10-23 06:37:56 -04:00
Craig Scott 5d20e6d803 Merge topic 'cmake-presets-source-dir-name' 
25742c589c CMakePresets.json: Add ${sourceDirName} macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5386
 2020-10-23 06:36:03 -04:00
Kitware Robot 6d306a42da CMake Nightly Date Stamp 2020-10-23 00:01:14 -04:00
Kyle Edwards 8aee7fdb32 cmState: Prohibit override of flow control commands 2020-10-22 17:04:31 -04:00
Kyle Edwards 3a82ff6a11 Merge topic 'cmake-16773' 
3c324689a7 include: refactor call sites of cmMakefile::ReadDependentFile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5405
 2020-10-22 12:00:39 -04:00
Kyle Edwards 12f6e37eb7 cmListFileCache: Enforce proper nesting of flow control statements 
Fixes: #19153
 2020-10-22 11:40:48 -04:00
Kyle Edwards 64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field 
Make this field separate for both architecture and toolset. Allow
architecture and toolset to be either strings or objects with value
and strategy fields.

Fixes: #21317
 2020-10-22 11:24:39 -04:00
Kyle Edwards 25742c589c CMakePresets.json: Add ${sourceDirName} macro 
Fixes: #21312
 2020-10-22 11:09:28 -04:00
Kyle Edwards 609122007d Merge topic 'cmake-presets-invalid-macro' into release-3.19 
638557cbfe CMakePresets.json: Properly report macro expansion errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5397
 2020-10-22 11:05:09 -04:00
Kyle Edwards 5ef9978087 Merge topic 'cmake-presets-invalid-macro' 
638557cbfe CMakePresets.json: Properly report macro expansion errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5397
 2020-10-22 11:05:09 -04:00
Kyle Edwards 6abe14d226 Merge topic 'cmake-presets-boolean-cache' 
920d180047 CMakePresets.json: Allow boolean for cache variable value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5398
 2020-10-22 11:04:19 -04:00
Volker Jacht 8ad6fabfc5 VS: Remove flag table entries for Fortran /Z* flags 
These were included when the Fortran flag table was first created by
commit 10c91ded4f (ENH: add support for Intel Fortran Visual studio IDE,
2008-04-30, v2.8.0~2227), but they map to fields not actually supported
by the IDE.  Remove their table entries.

Instead use just `/debug:minimal` and `/debug:full` to control debug
information level in VS Intel Fortran.  Let flags like `/Z7` pass
through as raw additional options because they have no corresponding IDE
property and can be used to complement the supported options.

Fixes: #21340
 2020-10-22 09:08:52 -04:00
Brad King 504aadf414 Merge topic 'move_pch_information_to_projects_where_possible' 
9df1f33c9a VisualStudio: move PCH rules to projects when possible.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5395
 2020-10-22 08:51:46 -04:00
Kitware Robot 3870f57ac5 CMake Nightly Date Stamp 2020-10-22 00:01:13 -04:00
Kyle Edwards 920d180047 CMakePresets.json: Allow boolean for cache variable value 
Fixes: #21327
 2020-10-21 10:37:08 -04:00
Brad King ccd313a074 Merge topic 'constify' 
bd705788f6 Constify some code as suggested by clang-tidy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5391
 2020-10-21 10:19:47 -04:00
Kyle Edwards 638557cbfe CMakePresets.json: Properly report macro expansion errors 
Make a distinction between strings which simply use the
$vendor{<...>} macro, which is valid but makes it unusable by CMake,
and strings which actually contain invalid macro expansions.

Fixes: #21308
 2020-10-21 09:20:52 -04:00
Asit Dhal 3c324689a7 include: refactor call sites of cmMakefile::ReadDependentFile 
Fixes: #16773
 2020-10-21 11:20:37 +02:00
Kitware Robot 7398b4783e CMake Nightly Date Stamp 2020-10-21 00:01:17 -04:00
Robert Maynard 9df1f33c9a VisualStudio: move PCH rules to projects when possible. 
This dramatically helps reduce the size of the solution files
when PCH is enabled, since 2 entries per source file are removed.

This also corrects a subtle issue where when UNITY + PCH was enabled,
the PCH would not be used if a user explicitly tried to compile
a source file from outside the unity group. This is possible via
the compile source option in the Visual Studio GUI.
 2020-10-20 13:24:31 -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
Kitware Robot 7bac94e38c CMake Nightly Date Stamp 2020-10-20 00:01:15 -04:00
Cengizhan Pasaoglu bd705788f6 Constify some code as suggested by clang-tidy 2020-10-20 00:04:04 +03: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
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
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
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 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 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 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
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
Kitware Robot eee8fc40c9 CMake Nightly Date Stamp 2020-10-16 00:01:14 -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
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