Commit Graph

54926 Commits

Author SHA1 Message Date
Brad King
ada9855b78 gitlab-ci: Run manual jobs automatically only on scheduled pipelines
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.
2021-10-27 13:30:20 -04:00
Brad King
70024a4cf5 Merge branch 'release-3.21' into release-3.22 2021-10-27 10:41:58 -04:00
Brad King
f65cebf51a CMake 3.21.4 v3.21.4 2021-10-27 09:51:39 -04:00
Brad King
964af18dc1 Merge topic 'envmod-support-mod-to-new-variables' into release-3.22
69f95cf1d9 cmCTestRunTest: fix modifying non-existent envvars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6663
2021-10-27 09:20:45 -04:00
Brad King
550c259819 Merge topic 'vs-instance-repeat' into release-3.22
9eaf0932af cmGlobalVisualStudioVersionedGenerator: Fix repeating SetGeneratorInstance

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6665
2021-10-27 09:19:53 -04:00
Brad King
31d49d613a Merge topic 'doc-ENVIRONMENT_MODIFICATION' into release-3.22
f6177f05da Help: Clarify ENVIRONMENT_MODIFICATION case sensitivity

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6661
2021-10-27 09:18:56 -04:00
Brad King
b78d0392ea Merge topic 'hip-flags-append' into release-3.22
3d0e2775a5 HIP: Add missing space when appending --cuda-host-only

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6662
2021-10-27 09:08:37 -04:00
Brad King
ed98970a13 Merge branch 'release-3.21' into release-3.22 2021-10-27 09:03:00 -04:00
Brad King
ebde1c16ab Merge topic 'vs2022' into release-3.22
8b64fc7dbb Help: Drop 3.22 release note for VS 2022
050ed59412 Merge branch 'backport-3.21-vs2022' into vs2022
f3ddc52676 VS: Update Visual Studio 17 2022 generator for the Release Candidates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6664
2021-10-27 09:01:50 -04:00
Brad King
9d44ea4cde Merge branch 'backport-3.21-vs2022' into release-3.21
Merge-request: !6664
2021-10-27 09:00:58 -04:00
Brad King
8b64fc7dbb Help: Drop 3.22 release note for VS 2022
The 3.21.4 release will have full support, so it is not new to
the 3.22 series anymore.
2021-10-27 08:51:08 -04:00
Brad King
050ed59412 Merge branch 'backport-3.21-vs2022' into vs2022 2021-10-27 08:51:00 -04:00
Brad King
f3ddc52676 VS: Update Visual Studio 17 2022 generator for the Release Candidates
Assume this is close enough to the final release to treat as
non-experimental support.
2021-10-27 08:49:47 -04:00
Brad King
9eaf0932af cmGlobalVisualStudioVersionedGenerator: Fix repeating SetGeneratorInstance
Fix logic added by commit 8917b8512f
(cmGlobalVisualStudioVersionedGenerator: Allow repeating
SetGeneratorInstance, 2021-10-20) to avoid repeating work.
2021-10-26 14:07:07 -04:00
Ben Boeckel
69f95cf1d9 cmCTestRunTest: fix modifying non-existent envvars
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
2021-10-26 12:51:44 -04:00
Brad King
3d0e2775a5 HIP: Add missing space when appending --cuda-host-only
Fixes: #22805
2021-10-26 10:48:48 -04:00
Michael Hirsch
f6177f05da Help: Clarify ENVIRONMENT_MODIFICATION case sensitivity 2021-10-26 09:37:14 -04:00
Brad King
fb6ab54076 Merge branch 'release-3.21' into release-3.22 2021-10-26 09:08:30 -04:00
Brad King
814567faa3 Merge topic 'binutils-llvm-strip' into release-3.22
5dd981539f BinUtils: Avoid llvm-strip versions older than Clang 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6655
2021-10-26 09:07:30 -04:00
Brad King
69355ff00c Merge branch 'binutils-llvm-strip' into release-3.21
Merge-request: !6655
2021-10-22 09:25:24 -04:00
Brad King
5dd981539f BinUtils: Avoid llvm-strip versions older than Clang 11
Since commit cf82300a63 (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
2021-10-22 09:24:46 -04:00
Brad King
b0c62a133e Merge topic 'vs-instance' into release-3.22
46e9ff5729 Restore honoring CMAKE_GENERATOR_INSTANCE in toolchain file
42418b02f7 Android: Refactor sysroot detection under Visual Studio
44a86d0b38 cmake_host_system_information: Add undocumented VS_MSBUILD_COMMAND key
6999b87133 cmGlobalVisualStudio10Generator: Add method to find MSBuild early
7f730464be cmGlobalGenerator: Add method to check if generator is at least VS 10
8917b8512f cmGlobalVisualStudioVersionedGenerator: Allow repeating SetGeneratorInstance
6511654164 cmGlobalVisualStudio10Generator: Allow subclasses to reset MSBuild search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6646
2021-10-21 09:21:23 -04:00
Brad King
d97497ee65 Merge topic 'doc-file-INSTALL-fix' into release-3.22
1560265e7d Help: Fix file(INSTALL) docs w.r.t. CMAKE_INSTALL_MESSAGE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6645
2021-10-21 09:20:02 -04:00
Brad King
46e9ff5729 Restore honoring CMAKE_GENERATOR_INSTANCE in toolchain file
Revert the changes from commit d5b5c19278 (cmGlobalGenerator:
FindMakeProgram() before CMakeDetermineSystem, 2020-06-15,
v3.19.0-rc1~619^2~3) and commit ef91fb02f3 (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
2021-10-20 13:00:26 -04:00
Brad King
42418b02f7 Android: Refactor sysroot detection under Visual Studio
Since commit 6051a49c78 (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 d5b5c19278 (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.
2021-10-20 13:00:25 -04:00
Brad King
44a86d0b38 cmake_host_system_information: Add undocumented VS_MSBUILD_COMMAND key
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.
2021-10-20 13:00:25 -04:00
Brad King
6999b87133 cmGlobalVisualStudio10Generator: Add method to find MSBuild early
Add a way to find MSBuild before the main `FindMakeProgram` code path
has executed.
2021-10-20 13:00:25 -04:00
Brad King
7f730464be cmGlobalGenerator: Add method to check if generator is at least VS 10 2021-10-20 13:00:25 -04:00
Brad King
8917b8512f cmGlobalVisualStudioVersionedGenerator: Allow repeating SetGeneratorInstance 2021-10-20 13:00:25 -04:00
Brad King
6511654164 cmGlobalVisualStudio10Generator: Allow subclasses to reset MSBuild search
While at it, convert to inline initialization.
2021-10-20 13:00:25 -04:00
Arcturus Arcturus
1560265e7d Help: Fix file(INSTALL) docs w.r.t. CMAKE_INSTALL_MESSAGE
In commit c9568de52c (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
2021-10-20 12:48:04 -04:00
Brad King
2f7e72a341 Merge branch 'release-3.21' into release-3.22 2021-10-19 09:46:35 -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
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
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
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
9b29cfd21f Merge branch 'release-3.21' into release-3.22 2021-10-18 09:31:18 -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
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
Brad King
e16eaa723b Merge branch 'release-3.21' into release-3.22 2021-10-15 07:37:36 -04:00