summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.22'Brad King2021-11-020-0/+0
|\
| * 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
* | \ Merge topic 'FindMPI-pkg-config'Brad 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
* | | CMake Nightly Date StampKitware Robot2021-11-021-1/+1
| | |
* | | Merge topic 'vs-instance'Brad King2021-11-0135-95/+426
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 195d47e213 VS: Allow CMAKE_GENERATOR_INSTANCE to specify portable instance ec8d37b3b1 VS: Support version specification in CMAKE_GENERATOR_INSTANCE 8e6d930e8c VS: Parse comma-separated fields from CMAKE_GENERATOR_INSTANCE 5d1f377737 cmVSSetupHelper: Factor out helper to load MSVC toolset version 006fe1e919 cmVSSetupHelper: Convert wide to narrow strings early f5dfc788b8 cmVSSetupHelper: Drop unused InstanceId field 3213e2595d cmVSSetupHelper: Drop unused ullVersion field 152f9978dd Help: De-duplicate VS instance selection documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6651
| * | | VS: Allow CMAKE_GENERATOR_INSTANCE to specify portable instanceBrad King2021-10-299-1/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the `CMAKE_GENERATOR_INSTANCE` value was used only to filter the instances reported by the Visual Studio Installer tool. If the specified install location is not known to the VS Installer, but the user provided a `version=` field, check for the installation directly on disk. Fixes: #21639, #22197
| * | | VS: Support version specification in CMAKE_GENERATOR_INSTANCEBrad King2021-10-2922-11/+167
| | | |
| * | | VS: Parse comma-separated fields from CMAKE_GENERATOR_INSTANCEBrad King2021-10-2910-3/+135
| | | |
| * | | cmVSSetupHelper: Factor out helper to load MSVC toolset versionBrad King2021-10-291-16/+26
| | | |
| * | | cmVSSetupHelper: Convert wide to narrow strings earlyBrad King2021-10-292-14/+13
| | | |
| * | | cmVSSetupHelper: Drop unused InstanceId fieldBrad King2021-10-292-8/+0
| | | | | | | | | | | | | | | | Minimize the amount of information needed about a VS instance.
| * | | cmVSSetupHelper: Drop unused ullVersion fieldBrad King2021-10-292-8/+0
| | | | | | | | | | | | | | | | | | | | The field has not been used since commit 3fd65f5ca6 (VS: Compare VS instance versions as strings, 2021-06-17, v3.21.0-rc1~11^2~1).
| * | | Help: De-duplicate VS instance selection documentationBrad King2021-10-294-41/+22
| | | | | | | | | | | | | | | | | | | | Add a section to `CMAKE_GENERATOR_INSTANCE` for VS instance selection, and reference it from the corresponding sections of each VS generator.
* | | | Merge branch 'release-3.22'Brad King2021-11-010-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
* | | | Merge topic 'envmod-test-modifying-existing'Brad 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 'misc-messages'Brad King2021-11-0110-49/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dbe33b20bd install: Add context to {PUBLIC,PRIVATE}_HEADER/RESOURCE DESTINATION warnings 1a25f057da cmComputeLinkInformation: Add context to warning about linking a directory 4862f3b2c8 cmcmd: Write progress and tar errors directly to stderr efc6c23a47 bootstrap: Do not declare cmSystemTools functions that are not implemented Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6680
| * | | | install: Add context to {PUBLIC,PRIVATE}_HEADER/RESOURCE DESTINATION warningsBrad King2021-10-273-12/+30
| | | | |
| * | | | cmComputeLinkInformation: Add context to warning about linking a directoryBrad King2021-10-272-9/+10
| | | | |
| * | | | cmcmd: Write progress and tar errors directly to stderrBrad King2021-10-271-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | In these code paths, `cmSystemTools::Message` never has a callback set. Inline the non-callback implementation at call sites.
| * | | | bootstrap: Do not declare cmSystemTools functions that are not implementedBrad King2021-10-275-22/+19
| | | | | | | | | | | | | | | | | | | | Convert runtime error messages into compile-time errors.
* | | | | CMake Nightly Date StampKitware Robot2021-11-011-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2021-10-311-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2021-10-301-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'release-3.22'Brad King2021-10-290-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
* | | | Merge topic 'doc-vs-instance-ver'Brad 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 'ifw-archive-format'Brad King2021-10-294-0/+81
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62ef2729ee CPackIFW: add support for archive format and compression level options Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6666
| * | | CPackIFW: add support for archive format and compression level optionsErlend E. Aasland2021-10-284-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the following CPackIFW variables: - CPACK_IFW_ARCHIVE_FORMAT - CPACK_IFW_ARCHIVE_COMPRESSION These variables control mirror the --archive-format and --compression options of the QtIFW binarycreator and repogen tools. Fixes: #22803 Co-authored-by: Erlend E. Aasland <erlend.aasland@innova.no> Co-authored-by: Awen Autret
* | | | Merge topic 'swift-win32-property'Brad King2021-10-294-6/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c782f140d4 Swift: Ignore WIN32_EXECUTABLE property outside of Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6658
| * | | | Swift: Ignore WIN32_EXECUTABLE property outside of Windowshotwatermorning2021-10-284-6/+19
| | | | | | | | | | | | | | | | | | | | Issue: #19877
* | | | | Merge branch 'release-3.22'Brad King2021-10-290-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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
* | \ \ \ \ Merge topic 'msvc-c17'Brad 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 branch 'release-3.22'Brad King2021-10-290-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | | | | | Merge topic 'doc-configure_file-creates-directories'Brad 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 Nightly Date StampKitware Robot2021-10-291-1/+1
| | | | |
* | | | | Merge branch 'release-3.22'Brad King2021-10-280-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | CMake 3.22.0-rc2v3.22.0-rc2Brad King2021-10-281-1/+1
| | | | |
* | | | | Merge topic 'target-sources-file-set'Brad King2021-10-28123-88/+2818
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7c71b9f03 Tests: Add tests for target_sources(FILE_SET) and associated functionality 4b0ee4e338 Help: Add documentation for target_sources(FILE_SET) and associated properties 3c3698b0e4 FileAPI: Add information on file set installers 8a09723bff cmGeneratorTarget: Integrate file sets into calculated sources 2a78d47b16 install(EXPORT): Install file sets 9b479124cc install(TARGETS): Add FILE_SET mode d8af2d954f target_sources(): Add FILE_SET mode f2bd022468 cmTargetSources: Refactor to add enum class parameters ... Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6653
| * | | | Tests: Add tests for target_sources(FILE_SET) and associated functionalityKyle Edwards2021-10-2765-0/+436
| | | | |