Brad King authored 3 years ago and Kitware Robot committed 3 years ago

51a2afe6 CPack/IFW: Add support for QtIFW 4.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6674

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

05475435 cmRST: support `versionadded` and `versionchanged` directives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6667

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

ada9855b gitlab-ci: Run manual jobs automatically only on scheduled pipelines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6671

Previously we ran manual jobs automatically in the `cmake/cmake`
project integration branches.  Change this to happen only when
the pipeline is created by a schedule.

Also, start automatic jobs in scheduled pipelines without delay.

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

69f95cf1 cmCTestRunTest: fix modifying non-existent envvars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6663

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

9eaf0932 cmGlobalVisualStudioVersionedGenerator: Fix repeating SetGeneratorInstance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6665

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

f6177f05 Help: Clarify ENVIRONMENT_MODIFICATION case sensitivity

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6661

Ben Boeckel authored 3 years ago and Brad King committed 3 years ago

This makes `versionadded` and `versionchanged` directives show up in
`cmake --help-*` output instead of disappearing (and potentially making
empty sections).

Fixes: #22808

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

3d0e2775 HIP: Add missing space when appending --cuda-host-only

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6662

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

8b64fc7d Help: Drop 3.22 release note for VS 2022
050ed594 Merge branch 'backport-3.21-vs2022' into vs2022
f3ddc526 VS: Update Visual Studio 17 2022 generator for the Release Candidates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6664

Merge-request: !6664

The 3.21.4 release will have full support, so it is not new to
the 3.22 series anymore.

Assume this is close enough to the final release to treat as
non-experimental support.

Fix logic added by commit 8917b851
(cmGlobalVisualStudioVersionedGenerator: Allow repeating
SetGeneratorInstance, 2021-10-20) to avoid repeating work.

When appending or modifying to a variable that has not been modified
before, the iterator was not valid, but it was used to insert into the
map again. Instead, just use indexing into the map since we know it will
exist by the end of the function anyways.

Fixes: #22796

Fixes: #22805

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

5dd98153 BinUtils: Avoid llvm-strip versions older than Clang 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6655

Merge-request: !6655

Since commit cf82300a (BinUtils: Clarify search logic and make it more
consistent, 2021-05-27, v3.21.0-rc1~119^2~2) we correctly prefer the
more-specific name `llvm-strip` over `strip` when using Clang.  However,
`llvm-strip` from Clang versions prior to 11 require extra flags to
strip everything.  Until our `install(TARGETS)` logic learns to add
those flags, avoid using older versions of `llvm-strip` by default.

Fixes: #22785

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

46e9ff57 Restore honoring CMAKE_GENERATOR_INSTANCE in toolchain file
42418b02 Android: Refactor sysroot detection under Visual Studio
44a86d0b cmake_host_system_information: Add undocumented VS_MSBUILD_COMMAND key
6999b871 cmGlobalVisualStudio10Generator: Add method to find MSBuild early
7f730464 cmGlobalGenerator: Add method to check if generator is at least VS 10
8917b851 cmGlobalVisualStudioVersionedGenerator: Allow repeating SetGeneratorInstance
65116541 cmGlobalVisualStudio10Generator: Allow subclasses to reset MSBuild search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6646

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

1560265e Help: Fix file(INSTALL) docs w.r.t. CMAKE_INSTALL_MESSAGE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6645

Revert the changes from commit d5b5c192 (cmGlobalGenerator:
FindMakeProgram() before CMakeDetermineSystem, 2020-06-15,
v3.19.0-rc1~619^2~3) and commit ef91fb02 (cmGlobalGenerator:
FindMakeProgram() at a generator-specific time, 2020-11-23,
v3.19.1~2^2).  We must delay selecting the location of MSBuild until
after an instance of Visual Studio has been selected.

It is now safe to revert the ordering because the motivating use
case (sysroot detection in Platform/Android-Determine) has been
implemented another way.

Fixes: #22782

Since commit 6051a49c (Visual Studio: Add Android support, 2020-06-12,
v3.19.0-rc1~619^2) we run MSBuild to build a sample project to detect
the sysroot.  Previously we relied on `CMAKE_VS_MSBUILD_COMMAND` being
available.  That required commit d5b5c192 (cmGlobalGenerator:
FindMakeProgram() before CMakeDetermineSystem, 2020-06-15,
v3.19.0-rc1~619^2~3) to make it available early enough.  However, that
ordering broke `CMAKE_GENERATOR_INSTANCE` so we need to prepare to
revert it.  Use `cmake_host_system_information` to get the location of
MSBuild under a VS generator instead.

When using the Visual Studio generator for VS 10 or above,
offer this key to get the location of the MSBuild command
before the first `project()` or `enable_language()` command
has finished running.

This will be needed only by one of our own modules, so leave it
undocumented for now.

Add a way to find MSBuild before the main `FindMakeProgram` code path
has executed.

While at it, convert to inline initialization.

Arcturus Arcturus authored 3 years ago and Brad King committed 3 years ago

In commit c9568de5 (install: Add CMAKE_INSTALL_MESSAGE variable
(#13761), 2014-06-24, v3.1.0-rc1~370^2~1) we incorrectly documented
that `CMAKE_INSTALL_MESSAGE` controls the status message for
`file(INSTALL)`.  Revert that.

Fixes: #17162

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

f117c7d1 Help: Update 3.22 release notes for the VS 2022 Release Candidate
d5a7448f Merge branch 'backport-3.21-vs2022' into vs2022
3d9d75b0 VS: Update Visual Studio 17 2022 generator for the Release Candidate

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6640