Commit Graph

54986 Commits

Author SHA1 Message Date
Jake Turner e09a3eddb6 Xcode: Support "GPU Frame Capture" scheme property
Added XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE variable which
sets the scheme property value for "GPU Frame Capture" in the Options section by setting the Xcode project variable "enableGPUFrameCaptureMode".

Example values are "Metal" (1) and "Disabled" (3).

XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE is initialized by the property CMAKE_XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE.

Implements: #22700
2021-10-19 15:24:10 +01:00
Brad King 52ea22ca65 Merge branch 'release-3.22' 2021-10-19 09:46:43 -04:00
Brad King 76b07824cb Merge branch 'release-3.21' 2021-10-19 09:46:41 -04:00
Brad King 2f7e72a341 Merge branch 'release-3.21' into release-3.22 2021-10-19 09:46:35 -04:00
Brad King 98c45349a3 Merge branch 'release-3.22' 2021-10-19 09:45:43 -04:00
Brad King 622add8671 Merge topic 'vs2022'
f117c7d11e Help: Update 3.22 release notes for the VS 2022 Release Candidate
d5a7448fa4 Merge branch 'backport-3.21-vs2022' into vs2022
3d9d75b0be VS: Update Visual Studio 17 2022 generator for the Release Candidate

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6640
2021-10-19 09:45:43 -04:00
Brad King 72393a9e73 Merge topic 'vs2022' into release-3.22
f117c7d11e Help: Update 3.22 release notes for the VS 2022 Release Candidate
d5a7448fa4 Merge branch 'backport-3.21-vs2022' into vs2022
3d9d75b0be VS: Update Visual Studio 17 2022 generator for the Release Candidate

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6640
2021-10-19 09:45:42 -04:00
Brad King f117c7d11e Help: Update 3.22 release notes for the VS 2022 Release Candidate 2021-10-19 09:37:05 -04:00
Brad King d5a7448fa4 Merge branch 'backport-3.21-vs2022' into vs2022 2021-10-19 09:36:19 -04:00
Brad King 69c6994023 Merge branch 'backport-3.21-vs2022' into release-3.21
Merge-request: !6640
2021-10-19 09:35:50 -04:00
Brad King 3d9d75b0be VS: Update Visual Studio 17 2022 generator for the Release Candidate 2021-10-19 09:27:37 -04:00
Brad King d723bac01c Merge topic 'lcc-compiler'
02b2607a5c Help: Add release note for MCST LCC compiler support
e5d9fce03f LCC: Add dedicated support for MCST LCC compiler
2b9ef77944 CPack/DEB: deal with broken dpkg-shlibdeps on E2K architecture
0995c75301 Tests/RPM: skip tests tat rely on debugedit if it's not found
ea55ac9a51 Tests/RunCMake/CommandLine: Deal with locales that are different from English

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6608
2021-10-19 09:22:22 -04:00
Brad King 02b2607a5c Help: Add release note for MCST LCC compiler support 2021-10-19 09:09:05 -04:00
Brad King cf55414007 Merge branch 'release-3.22' 2021-10-19 09:07:04 -04:00
Brad King d252b6a1a0 Merge topic 'doc-genex-CONFIG-commas'
ec94706791 Help: gen expr: note that CONFIG is comma-separated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6636
2021-10-19 09:07:04 -04:00
Brad King 7984f98d8f Merge topic 'doc-genex-CONFIG-commas' into release-3.22
ec94706791 Help: gen expr: note that CONFIG is comma-separated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6636
2021-10-19 09:07:03 -04:00
Michael Hirsch ec94706791 Help: gen expr: note that CONFIG is comma-separated 2021-10-19 09:05:48 -04:00
Brad King 0751a0344c Merge branch 'release-3.22' 2021-10-19 09:05:15 -04:00
Brad King e2a547602f Merge topic 'CheckLanguage-cuda-host-compiler' into release-3.22
7123c8fdbf CheckLanguage: Don't pass CMAKE_CUDA_HOST_COMPILER for Visual Studio

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6633
2021-10-19 09:05:14 -04:00
Brad King 1ace450a92 Merge topic 'CheckLanguage-cuda-host-compiler'
7123c8fdbf CheckLanguage: Don't pass CMAKE_CUDA_HOST_COMPILER for Visual Studio

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6633
2021-10-19 09:05:14 -04:00
Raul Tambre 7123c8fdbf CheckLanguage: Don't pass CMAKE_CUDA_HOST_COMPILER for Visual Studio
Visual Studio doesn't support specifying it and if we do we get a warning.

Fixes: #22712
2021-10-19 09:03:24 -04:00
Brad King 9f1ab65806 Merge topic 'ifw-run-program'
f2f4e66f64 CPackIFW: Add support for RunProgram* config variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
Merge-request: !6610
2021-10-19 09:02:07 -04:00
Brad King 239b280f76 Merge topic 'ci-openwatcom'
14f2dbad03 ci: Add Open Watcom 1.9 nightly CI job
94404e912e Tests: Disable SubDirSpaces test on Open Watcom

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6635
2021-10-19 08:59:31 -04:00
Kitware Robot 0a4ee77f39 CMake Nightly Date Stamp 2021-10-19 00:01:05 -04:00
Brad King 14f2dbad03 ci: Add Open Watcom 1.9 nightly CI job 2021-10-18 10:17:47 -04:00
Brad King 2d620e8380 Merge topic 'imported-no-system'
14d98bcfe6 export: Propagate IMPORTED_NO_SYSTEM target property to consumers
7df0541055 Add property to mark IMPORTED targets as not SYSTEM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Allison Vacanti <alliepiper16@gmail.com>
Merge-request: !6627
2021-10-18 09:38:28 -04:00
Brad King 1a1a8ff858 Merge branch 'release-3.22' 2021-10-18 09:31:37 -04:00
Brad King c5bf9a119f Merge branch 'release-3.21' 2021-10-18 09:31:34 -04:00
Brad King 6dbc6415ef Merge branch 'release-3.20' 2021-10-18 09:31:32 -04:00
Brad King cd7f9a0e9f Merge branch 'release-3.19' 2021-10-18 09:31:29 -04:00
Brad King 9b29cfd21f Merge branch 'release-3.21' into release-3.22 2021-10-18 09:31:18 -04:00
Brad King dce8c08dc9 Merge branch 'release-3.22' 2021-10-18 09:29:20 -04:00
Brad King 3c855b167f Merge topic 'fix-ifdef-windows'
40e73c5ac4 Source: Fix typo in _WIN32 preprocessor checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6631
2021-10-18 09:29:20 -04:00
Brad King 263f8c6119 Merge topic 'fix-ifdef-windows' into release-3.22
40e73c5ac4 Source: Fix typo in _WIN32 preprocessor checks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6631
2021-10-18 09:29:19 -04:00
Brad King e495f360b2 Merge topic 'ctest_submit-inactivity-timeout'
5d178fcc53 CTest: Add CTEST_SUBMIT_INACTIVITY_TIMEOUT variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6584
2021-10-18 09:27:14 -04:00
Brad King fe9b3d9fba Merge topic 'clang-Wdeprecated'
e2a4718d18 Source: Fix Clang -Wdeprecated warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6626
2021-10-18 09:26:18 -04:00
Kitware Robot 3ab799d379 CMake Nightly Date Stamp 2021-10-18 00:01:12 -04:00
Erlend E. Aasland f2f4e66f64 CPackIFW: Add support for RunProgram* config variables
This patch adds support for specifying <RunProgram>,
<RunProgramArguments>, and <RunProgramDescription> in the IFW
configuration file.
2021-10-17 21:15:57 +02:00
Kitware Robot 47cc20fc67 CMake Nightly Date Stamp 2021-10-17 00:03:09 -04:00
Kitware Robot 3486e4392e CMake Nightly Date Stamp 2021-10-16 00:01:05 -04:00
Brad King 94404e912e Tests: Disable SubDirSpaces test on Open Watcom
Open Watcom 1.9 does not support spaces in the path.
2021-10-15 14:46:31 -04:00
Brad King 14d98bcfe6 export: Propagate IMPORTED_NO_SYSTEM target property to consumers
Enabling `IMPORTED_NO_SYSTEM` on a target built within the project has
no effect on the build system, but it is still a useful way to set the
property on imported targets generated by `install(EXPORT)` and
`export()`.

Issue: #17364
2021-10-15 13:04:19 -04:00
Brad King 71dc6feed8 Merge branch 'release-3.20' into release-3.21 2021-10-15 12:15:15 -04:00
Brad King e8e64e1a0c Merge branch 'release-3.19' into release-3.20 2021-10-15 12:15:05 -04:00
Brad King 8497701d22 Merge branch 'fix-ifdef-windows' into release-3.21
Merge-request: !6631
2021-10-15 12:14:50 -04:00
Brad King ad76bedabb Merge branch 'fix-ifdef-windows' into release-3.20
Merge-request: !6631
2021-10-15 12:14:38 -04:00
Brad King f00763c954 Merge branch 'fix-ifdef-windows' into release-3.19
Merge-request: !6631
2021-10-15 12:13:59 -04:00
Brad King 40e73c5ac4 Source: Fix typo in _WIN32 preprocessor checks
Since CMake's default compiler flags with MSVC include `-DWIN32` for
historical reasons, a few preprocessor conditions were accidentally
checking for `WIN32` instead of `_WIN32`.  The corresponding blocks
were left out when compiling official binaries for `cmake.org` because
we hard-code compiler flags without `-DWIN32`.

Fixes: #22764
2021-10-15 11:39:04 -04:00
Sean McBride e2a4718d18 Source: Fix Clang -Wdeprecated warnings
Applied C++ 'rule of three'.
2021-10-15 11:23:12 -04:00
Craig Scott c5ae200d94 Merge topic 'ifw-installer-icon-filenames'
761b6e2466 CPackIFW: Avoid colliding names for icons / logos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6613
2021-10-15 08:38:58 -04:00