summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge topic 'support_nvcc_native_flag'Brad King2021-11-027-11/+117
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14d8a2768d CUDA: Support nvcc 11.5 new -arch=all|all-major flags Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6652
| * | | | | CUDA: Support nvcc 11.5 new -arch=all|all-major flagsRobert Maynard2021-11-017-11/+117
| | | | | |
* | | | | | Merge topic 'ci-msvc-v71'Brad King2021-11-025-0/+72
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11903f1b5f ci: Add MSVC v71 NMake nightly CI job Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6687
| * | | | | | ci: Add MSVC v71 NMake nightly CI jobBrad King2021-11-015-0/+72
| | | | | | |
* | | | | | | Merge topic 'update-kwsys'Brad King2021-11-022-10/+106
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37c2f722fc find_program: Explicitly skip WindowsApps/python*.exe app installer links d8b5b0c7e4 Merge branch 'upstream-KWSys' into update-kwsys e9ab6eeeb5 KWSys 2021-11-01 (572f2a65) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6679
| * | | | | | | find_program: Explicitly skip WindowsApps/python*.exe app installer linksBrad King2021-11-011-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows provide a "python" executable like this: %USERPROFILE%\AppData\Local\Microsoft\WindowsApps\python.exe It is actually a Windows app exec link. If it points to an app installer, avoid mistaking it for a working Python.
| * | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-11-011-10/+86
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-11-01 (572f2a65)
| | * | | | | | | KWSys 2021-11-01 (572f2a65)KWSys Upstream2021-11-011-10/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 572f2a6592d671ecc865fe7821a0f4803deb9be7 (master). Upstream Shortlog ----------------- Brad King (3): 025a4951 SystemTools: Add Windows app exec alias support to ReadSymlink f5b3500f SystemTools: Simplify FileIsExecutable on Windows bcddb31b SystemTools: Fix Windows app exec alias layout Yuriy O'Donnell (1): 29f31d17 SystemTools: Add Windows app exec alias support to FileExists()
* | | | | | | | | Merge branch 'release-3.22'Brad King2021-11-020-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | 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
* | \ \ \ \ \ \ \ \ Merge topic 'doc-cpackrpm-versionadded'Brad 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 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