summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmVisualStudio10TargetGenerator: Refactor target framework selectionBrad King2021-11-061-35/+53
| | | | Split the selection from the generation of the resulting element(s).
* cmGlobalVisualStudio8Generator: Refactor SetGeneratorPlatformBrad King2021-11-031-4/+11
| | | | | Re-organize the method to make room for additional `CMAKE_GENERATOR_PLATFORM` processing.
* Merge topic 'doc-cpackrpm-versionadded' into release-3.22Brad King2021-11-021-2/+4
|\ | | | | | | | | | | | | | | a7a499a459 Help: Add `versionadded` for `CPACK_RPM_REQUIRES_EXCLUDE_FROM` variable 3eefb78512 Help: Use lower-case names of sphinx directives Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6684
| * Help: Add `versionadded` for `CPACK_RPM_REQUIRES_EXCLUDE_FROM` variableAlex Turbov2021-11-011-0/+2
| |
| * Help: Use lower-case names of sphinx directivesBrad King2021-11-011-2/+2
| |
* | Merge topic 'FindMPI-pkg-config' into release-3.22Brad King2021-11-021-2/+2
|\ \ | |/ |/| | | | | | | | | 56d949f05f FindMPI: Fix finding PkgConfg for fallback Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6685
| * FindMPI: Fix finding PkgConfg for fallbackBrad King2021-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | In commit 0723b2c935 (MPI: Add fallback detection code for MPI when cross compiling, 2021-09-17, v3.22.0-rc1~89^2) the FindPkgConfig module was included directly. This produces warnings like: The package name passed to `find_package_handle_standard_args` (PkgConfig) does not match the name of the calling package (MPI). Use `find_package(PkgConfig)` instead, as other find modules do. Fixes: #22823
* | Merge topic 'envmod-test-modifying-existing' into release-3.22Brad King2021-11-014-1/+66
|\ \ | |/ |/| | | | | | | | | | | 9c4d6404eb Tests/Environment: also test modifying ambient values 7d52d48a32 cmCTestRunTest: get the default value from the environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6682
| * Tests/Environment: also test modifying ambient valuesBen Boeckel2021-10-293-0/+24
| |
| * cmCTestRunTest: get the default value from the environmentBen Boeckel2021-10-293-1/+42
| | | | | | | | | | | | | | | | This only works due to some assumptions about how the `ENVIRONMENT` property is processed. Comments have been added to notify anyone modifying the behavior about where to look. Fixes: #22819
* | Merge topic 'doc-vs-instance-ver' into release-3.22Brad King2021-10-291-13/+13
|\ \ | |/ |/| | | | | | | | | 0ad79f7ba8 Help: Fix versionadded for VS 15 2017 instance selection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6681
| * Help: Fix versionadded for VS 15 2017 instance selectionBrad King2021-10-291-13/+13
|/ | | | | | | | Support for `CMAKE_GENERATOR_INSTANCE` was added in CMake 3.11, but the possibility was mentioned in a comment in older versions, so the wrong versionadded value was used in commit c43e845d09 (Help: Add `.. versionadded` directives to generator docs, 2020-11-11, v3.20.0-rc1~476^2).
* Merge topic 'msvc-c17' into release-3.22Brad King2021-10-291-29/+39
|\ | | | | | | | | | | | | | | | | | | c5cc4ddac4 MSVC: Add support for C17 6561b032bc MSVC: Tolerate c_std_17 and c_std_23 features on older compiler versions 22f804e0ec MSVC: Refactor C compile features table for C90, C99, and C11 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6677
| * MSVC: Add support for C17Brad King2021-10-281-0/+2
| | | | | | | | | | | | C17 support has been available in MSVC since VS 16.8. Fixes: #22816
| * MSVC: Tolerate c_std_17 and c_std_23 features on older compiler versionsBrad King2021-10-281-0/+2
| | | | | | | | | | | | | | MSVC `cl` versions prior to 19.27 had no `-std:c*` flags for C standards. List the `c_std_{17,23}` features anyway. This allows projects to at least attempt compilation with these compilers since they do not have any modes.
| * MSVC: Refactor C compile features table for C90, C99, and C11Brad King2021-10-281-29/+35
| | | | | | | | | | | | | | | | | | | | | | The custom "no modes" `cmake_record_c_compile_features` implementation should only be used in `cl` versions prior to 19.27 because they had no `-std:c*` flags for C standards. For 19.27 we need a different custom implementation to account for partial C11 support. For 19.28 and above we can use the default implementation through the `*__HAS_FULL_SUPPORT` settings. We already use this pattern in the MSVC C++ compile feature table.
* | Merge topic 'doc-configure_file-creates-directories' into release-3.22Brad King2021-10-291-0/+1
|\ \ | |/ |/| | | | | | | | | fa47e9c8f9 Help: Document that configure_file can create directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6675
| * Help: Document that configure_file can create directoriesMarc Aldorasi2021-10-281-0/+1
|/
* CMake 3.22.0-rc2v3.22.0-rc2Brad King2021-10-281-1/+1
|
* Merge topic 'cpack-qtifw-4.2' into release-3.22Brad King2021-10-281-0/+1
|\ | | | | | | | | | | | | 51a2afe6e7 CPack/IFW: Add support for QtIFW 4.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6674
| * CPack/IFW: Add support for QtIFW 4.2Erlend E. Aasland2021-10-271-0/+1
| |
* | Merge topic 'builtin-help-versionadded' into release-3.22Brad King2021-10-285-0/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | 054754359a cmRST: support `versionadded` and `versionchanged` directives Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6667
| * | cmRST: support `versionadded` and `versionchanged` directivesBen Boeckel2021-10-275-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | This makes `versionadded` and `versionchanged` directives show up in `cmake --help-*` output instead of disappearing (and potentially making empty sections). Fixes: #22808
* | | Merge topic 'ci-scheduled' into release-3.22Brad King2021-10-271-2/+5
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | ada9855b78 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
| * | gitlab-ci: Run manual jobs automatically only on scheduled pipelinesBrad King2021-10-271-2/+5
|/ / | | | | | | | | | | | | | | 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.
* | Merge branch 'release-3.21' into release-3.22Brad King2021-10-270-0/+0
|\ \
| * | CMake 3.21.4v3.21.4Brad King2021-10-271-1/+1
| | |
* | | Merge topic 'envmod-support-mod-to-new-variables' into release-3.22Brad King2021-10-273-7/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69f95cf1d9 cmCTestRunTest: fix modifying non-existent envvars Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6663
| * | | cmCTestRunTest: fix modifying non-existent envvarsBen Boeckel2021-10-263-7/+27
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'vs-instance-repeat' into release-3.22Brad King2021-10-272-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9eaf0932af cmGlobalVisualStudioVersionedGenerator: Fix repeating SetGeneratorInstance Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6665
| * | | cmGlobalVisualStudioVersionedGenerator: Fix repeating SetGeneratorInstanceBrad King2021-10-262-2/+6
| |/ / | | | | | | | | | | | | | | | Fix logic added by commit 8917b8512f (cmGlobalVisualStudioVersionedGenerator: Allow repeating SetGeneratorInstance, 2021-10-20) to avoid repeating work.
* | | Merge topic 'doc-ENVIRONMENT_MODIFICATION' into release-3.22Brad King2021-10-271-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Help: Clarify ENVIRONMENT_MODIFICATION case sensitivityMichael Hirsch2021-10-261-2/+3
| |/ /
* | | Merge topic 'hip-flags-append' into release-3.22Brad King2021-10-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3d0e2775a5 HIP: Add missing space when appending --cuda-host-only Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6662
| * | | HIP: Add missing space when appending --cuda-host-onlyBrad King2021-10-261-1/+1
| |/ / | | | | | | | | | Fixes: #22805
* | | Merge branch 'release-3.21' into release-3.22Brad King2021-10-270-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'backport-3.21-vs2022' into release-3.21Brad King2021-10-272-10/+10
| |\ \ | | | | | | | | | | | | Merge-request: !6664
* | \ \ Merge topic 'vs2022' into release-3.22Brad King2021-10-273-14/+10
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Help: Drop 3.22 release note for VS 2022Brad King2021-10-271-4/+0
| | | | | | | | | | | | | | | | | | | | The 3.21.4 release will have full support, so it is not new to the 3.22 series anymore.
| * | | Merge branch 'backport-3.21-vs2022' into vs2022Brad King2021-10-272-10/+10
| |\ \ \ |/ / / / | | | _
| * | VS: Update Visual Studio 17 2022 generator for the Release CandidatesBrad King2021-10-272-10/+10
| | | | | | | | | | | | | | | Assume this is close enough to the final release to treat as non-experimental support.
* | | Merge branch 'release-3.21' into release-3.22Brad King2021-10-260-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'binutils-llvm-strip' into release-3.21Brad King2021-10-221-1/+4
| |\ \ | | | | | | | | | | | | Merge-request: !6655
* | \ \ Merge topic 'binutils-llvm-strip' into release-3.22Brad King2021-10-261-1/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 5dd981539f BinUtils: Avoid llvm-strip versions older than Clang 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6655
| * | | BinUtils: Avoid llvm-strip versions older than Clang 11Brad King2021-10-221-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'vs-instance' into release-3.22Brad King2021-10-2115-36/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Restore honoring CMAKE_GENERATOR_INSTANCE in toolchain fileBrad King2021-10-204-33/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Android: Refactor sysroot detection under Visual StudioBrad King2021-10-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | cmake_host_system_information: Add undocumented VS_MSBUILD_COMMAND keyBrad King2021-10-206-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | cmGlobalVisualStudio10Generator: Add method to find MSBuild earlyBrad King2021-10-204-0/+21
| | | | | | | | | | | | | | | | | | | | Add a way to find MSBuild before the main `FindMakeProgram` code path has executed.