summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ninja Multi-Config: Fix custom command target dependencies in cross-configsBrad King2021-11-046-4/+34
| | | | | | | | | | | Generator expressions in a non-cross custom command's `COMMAND` arguments are evaluated in the command config. Target-level dependencies implied by `TARGET_FILE` must therefore be cross dependencies. This is important to generate proper target-level dependencies on the cross-config build statements for the target to which the custom command is attached. Fixes: #22855
* Ninja Multi-Config: Fix internal cross-config target dependency orderingBrad King2021-11-041-4/+8
| | | | | | | | | | | In commit 7abc3d61ac (Ninja Multi-Config: Fix issue with framework dependencies and Autogen, 2020-02-13, v3.17.0-rc2~18^2) the `cmLinkItem` comparison operator was updated to order identical strings by the cross-config boolean. We need to order identical targets that way too in order to represent both a cross and non-cross dependency on the same target. Issue: #22855
* Ninja Multi-Config: Fix cross-config custom command dependency tracingBrad King2021-11-044-5/+5
| | | | | | Process `CMAKE_CROSS_CONFIGS` and friends to properly configure the generator for cross-config behavior before custom command dependency tracing.
* Merge branch 'release-3.21' into release-3.22Brad King2021-11-040-0/+0
|\
| * Merge branch 'doc-TARGET_RUNTIME_DLLS' into release-3.21Brad King2021-11-032-2/+14
| |\ | | | | | | | | | Merge-request: !6700
| * \ Merge branch 'msvc-cxx-modules-scanDependencies' into release-3.21Brad King2021-11-031-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !6696
| * \ \ Merge branch 'GNUtoMS-vs2022' into release-3.21Brad King2021-11-031-1/+1
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !6695
* | \ \ \ Merge topic 'doc-TARGET_RUNTIME_DLLS' into release-3.22Brad King2021-11-042-2/+14
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 001870d451 Help: Clarify TARGET_RUNTIME_DLLS behavior on imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robertjmaynard@gmail.com> Merge-request: !6700
| * | | | Help: Clarify TARGET_RUNTIME_DLLS behavior on imported targetsBrad King2021-11-032-2/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This generator expression does not report the locations of `.dll` files on imported targets with the `UNKNWON` type, since their `IMPORTED_LOCATION` refers to the import library and not the DLL. Fixes: #22845
* | | | Merge topic 'FindHDF5-avoid-duplicate-library-entries' into release-3.22Brad King2021-11-041-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 247f1149e1 FindHDF5: clear language-specific libraries list before discovery f56963cf05 FindHDF5: clear library output variables at the top of the module Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6698
| * | | | FindHDF5: clear language-specific libraries list before discoveryBen Boeckel2021-11-031-0/+6
| | | | |
| * | | | FindHDF5: clear library output variables at the top of the moduleBen Boeckel2021-11-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This avoids accumulation of `HDF5_LIBRARIES` results when calling `find_package(HDF5)` multiple times within a single scope.
* | | | | Merge topic 'msvc-cxx-modules-scanDependencies' into release-3.22Brad King2021-11-041-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ed1d7bee6 cmScanDepFormat: Accept P1689r4 files with version 1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6696
| * | | | cmScanDepFormat: Accept P1689r4 files with version 1Brad King2021-11-031-1/+1
| | |/ / | |/| | | | | | | | | | | | | | VS 2022's `cl` 19.30 has a `-scanDependencies` option that produces the P1689r4 format. It reports the "version" field with value "1".
* | | | Merge topic 'FindHDF5-fix-windows-hl-implib-query' into release-3.22Brad King2021-11-041-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f830c5c38 FindHDF5: fix variable name when querying `hdf5_hl`'s implib Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6697
| * | | | FindHDF5: fix variable name when querying `hdf5_hl`'s implibBen Boeckel2021-11-031-1/+1
| | |/ / | |/| | | | | | | | | | Introduced in 4150048a3b (FindHDF5: unset some variables, 2017-07-24).
* | | | Merge topic 'GNUtoMS-vs2022' into release-3.22Brad King2021-11-041-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 571a795d2f GNUtoMS: Add search path for VS 2022 environment scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6695
| * | | GNUtoMS: Add search path for VS 2022 environment scriptsBrad King2021-11-031-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | Extend the logic from commit 08c5b3eff0 (GNUtoMS: Add search path for VS 2019 environment scripts, 2020-01-09, v3.16.3~15^2) to consider VS 2022 paths too. Fixes: #22847
* | | Merge topic 'ninja-pdb-dir' into release-3.22Brad King2021-11-042-3/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 73b84db62d Ninja: Fix creation of Windows import library directory bd36735f65 cmNinjaTargetGenerator: Replace "their" with "there" in comment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6694
| * | Ninja: Fix creation of Windows import library directoryBrad King2021-11-031-2/+2
| | | | | | | | | | | | | | | | | | | | | Call `EnsureParentDirectoryExists` with our internal representation of the path, not the representation quoted/encoded for Ninja. Fixes: #22841
| * | cmNinjaTargetGenerator: Replace "their" with "there" in commentBrad King2021-11-031-1/+1
| | |
* | | Merge topic 'help_cmake_lang_extensions_default' into release-3.22Brad King2021-11-0310-19/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e9976c8827 Help: Better explain CMAKE_<LANG>_EXTENSIONS_DEFAULT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6686
| * | | Help: Better explain CMAKE_<LANG>_EXTENSIONS_DEFAULTRaul Tambre2021-11-0210-19/+36
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain that this represents the compiler's default and mustn't be modified by the user. Clarify when it's used as the default. Additionally: * Add a reference to it in cmake-compile-features in text explaining the feature. * Add explanations for the default initialization by `CMAKE_<LANG>_EXTENSIONS_DEFAULT` to all `<LANG>_EXTENSIONS` pages and references to CMP0128. * Slightly reduce the wordiness of the default initialization explanations by removing an unnecessary "it is". Fixes #22828.
* | | Merge topic 'nvhpc-isystem' into release-3.22Brad King2021-11-032-0/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 92624714c4 NVHPC: Support SYSTEM include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6691
| * | NVHPC: Support SYSTEM include directoriesRobert Maynard2021-11-022-0/+2
| | | | | | | | | | | | Fixed #22834
* | | 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
| | |
generated by cgit v0.12 at 2025-02-08 08:19:44 (GMT)