summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ExternalProject: Use ${ref}^0 to avoid MSYS/Cygwin shell substitutionsCraig Scott2021-06-201-1/+1
| | | | | | | | | | | In 5e941a545b (ExternalProject: Ensure git fetch if updating to hash we don't have yet, 2021-05-09), the form ${ref}^{commit} was used to ensure the ref was treated as a commit. When running under a MSYS2 or Cygwin shell, the {commit} part can be translated by the shell, leaving it as ${ref}^commit, which git doesn't understand. Use the equivalent but safer form ${ref}^0, since it won't be subject to the shell substitution issue. Fixes: #22299
* Merge topic 'fix-flow-control-override' into release-3.20Brad King2021-06-176-8/+22
|\ | | | | | | | | | | | | c017098d4d CMake: Allow override of unexpected non-flow-control commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6232
| * CMake: Allow override of unexpected non-flow-control commandsKyle Edwards2021-06-166-8/+22
| | | | | | | | Fixes: #22310
* | Merge topic 'vs-map-external-warnings' into release-3.20Brad King2021-06-174-14/+38
|\ \ | |/ |/| | | | | | | | | | | | | 947f0c8b81 VS: Do not apply '/external:W*' flag table mapping on VS < 16.10 e59a208b69 cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion method d6d4af0ec3 cmGlobalVisualStudio10Generator: Move static functions to anonymous namespace Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6233
| * VS: Do not apply '/external:W*' flag table mapping on VS < 16.10Brad King2021-06-161-4/+14
| | | | | | | | | | | | | | | | | | | | Since commit 9054cd05e6 (VS: Add flag table entries for '/external:W*' flags in VS 16.10, 2021-05-28, v3.20.4~10^2) we map flags to the `ExternalWarningLevel` element. VS 16.9 does not support that element, but its `cl` compiler does support the `/external:W*` flags. Filter out the flag table entry on older VS versions. Fixes: #22308
| * cmGlobalVisualStudio10Generator: Adopt GetVSInstanceVersion methodBrad King2021-06-163-7/+19
| | | | | | | | Port from `cmGlobalVisualStudioVersionedGenerator`.
| * cmGlobalVisualStudio10Generator: Move static functions to anonymous namespaceBrad King2021-06-161-4/+6
|/
* Merge topic 'ci-xcode-12.5' into release-3.20Brad King2021-06-161-6/+6
|\ | | | | | | | | | | | | 9c98878451 gitlab-ci: update macOS jobs to use Xcode 12.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6229
| * gitlab-ci: update macOS jobs to use Xcode 12.5Brad King2021-06-151-6/+6
|/
* CMake 3.20.4v3.20.4Brad King2021-06-141-1/+1
|
* Merge topic 'help-cmake_path-IS_PREFIX' into release-3.20Brad King2021-06-141-3/+4
|\ | | | | | | | | | | | | e49cbf1d44 Help: cmake_path: fix erroneous example for IS_PREFIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6223
| * Help: cmake_path: fix erroneous example for IS_PREFIXMarc Chevrier2021-06-121-3/+4
| |
* | Merge topic 'fileapi-link-fragments' into release-3.20Brad King2021-06-141-4/+5
|\ \ | |/ |/| | | | | | | | | 68bbec66e0 fileapi: Fix codemodel-v2 link command fragment relative paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6220
| * fileapi: Fix codemodel-v2 link command fragment relative pathsBrad King2021-06-111-4/+5
|/ | | | | | | Use the same `cmLinkLineComputer` subclass as the generator does. This affects the base directory from which relative paths are computed. Fixes: #22301
* Merge topic 'presets-build-fixes' into release-3.20Brad King2021-06-095-13/+41
|\ | | | | | | | | | | | | | | | | | | 534c40e6d8 presets: Fix buildPreset "targets" not allowing a single string 5d67632813 presets: Fix buildPreset "jobs" 93e396b402 presets: Fix buildPreset "jobs" field test case Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !6190
| * presets: Fix buildPreset "targets" not allowing a single stringSam Freed2021-06-083-8/+16
| | | | | | | | Fixes: #22272
| * presets: Fix buildPreset "jobs"Sam Freed2021-06-081-1/+3
| | | | | | | | Fixes: #22273
| * presets: Fix buildPreset "jobs" field test caseBrad King2021-06-083-4/+22
| | | | | | | | | | Avoid passing parallel build options to Make tools that do not support them.
* | Merge topic 'irsl-intel-oneapi-windows' into release-3.20Brad King2021-06-091-1/+3
|\ \ | | | | | | | | | | | | | | | | | | 6d4c51c29e IRSL: Add Intel oneAPI redist location on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6199
| * | IRSL: Add Intel oneAPI redist location on WindowsBrad King2021-06-081-1/+3
|/ / | | | | | | Fixes: #22283
* | Merge topic 'FindBoost-json-header' into release-3.20Brad King2021-06-071-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | c44dfdfdbb FindBoost: Add check for json component header in Boost 1.75+ Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6193
| * | FindBoost: Add check for json component header in Boost 1.75+John Drouhard2021-06-041-0/+1
| | | | | | | | | | | | | | | | | | In commit 8293064760 (FindBoost: Add support for Boost 1.75, 2021-02-03, v3.19.5~9^2) the dependencies of the json component were added, but the header listing was left out.
* | | Merge topic 'ci-sccache-consistent-builds' into release-3.20Brad King2021-06-041-33/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9d7ebb47ea ci: use consistent sccache builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6156
| * | | ci: use consistent sccache buildsBen Boeckel2021-06-021-33/+18
| | | |
* | | | Merge topic 'msvc_cxx20_23' into release-3.20Brad King2021-06-022-4/+20
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 886e27062b Clang/MSVC: C++20 final flag, C++23 support 3aaf1d91bf MSVC: C++20 final flag, C++23 support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Acked-by: Michael Hirsch <michael@scivision.dev> Merge-request: !6174
| * | | Clang/MSVC: C++20 final flag, C++23 supportRaul Tambre2021-05-291-3/+12
| | | | | | | | | | | | | | | | | | | | Added in LLVM commit a8f75d497daa2684a03909d7c31d5bce11b427e1, will be released in 13.0.
| * | | MSVC: C++20 final flag, C++23 supportRaul Tambre2021-05-291-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Microsoft intends to ship the final C++20 flag in VS 16.11 albeit with a few parts missing due planned ABI breaking changes. The current 16.11 Preview 1 toolchain version is 19.29.30129.3, so let's restrict based on that.
* | | | Merge topic 'fix-compile-db-crash' into release-3.20Brad King2021-05-292-3/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 316cbbe8d5 Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6173
| * | | Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile ruleBrad King2021-05-282-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the fix from commit 67e2130c96 (Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule, 2020-11-20, v3.19.1~8^2) to work for the `<FLAGS>` placeholder too. Also fix the test case to actually enable `EXPORT_COMPILE_COMMANDS` on the test target. Fixes: #22261
* | | | Merge topic 'ci-msvc-14.29-16.10' into release-3.20Brad King2021-05-281-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59d9fa7131 gitlab-ci: Update Windows builds to MSVC 19.29-16.10 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6172
| * | | | gitlab-ci: Update Windows builds to MSVC 19.29-16.10 toolsetBrad King2021-05-281-4/+4
| |/ / /
* | | | Merge topic 'vs-16.10-map-external-warnings' into release-3.20Brad King2021-05-281-0/+35
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 9054cd05e6 VS: Add flag table entries for '/external:W*' flags in VS 16.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6171
| * | | VS: Add flag table entries for '/external:W*' flags in VS 16.10Brad King2021-05-281-0/+35
| | |/ | |/| | | | | | | Fixes: #22255
* | | Merge topic 'vs-toolset-version' into release-3.20Brad King2021-05-281-0/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | a60141feaa VS: Add special case for '-T version=14.29.16.10' under VS 16.10 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6169
| * | VS: Add special case for '-T version=14.29.16.10' under VS 16.10Brad King2021-05-271-0/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Extend the table of special cases from commit 58a50a3a0a (VS: Fix '-T version=14.28' under VS 16.9, 2021-03-11, v3.19.7~1^2~1). Add a special case for the name VS 16.11 will use for VS 16.10's default toolset, so that it can be used with VS 16.10 too. Using '-T version=14.29.16.10' actually works under VS 16.10 without this change, but only because there is only one 14.29 toolset so the two-component prefix happens to match the right one. Make it explicit. Issue: #21922
* | CMake 3.20.3v3.20.3Brad King2021-05-271-1/+1
| |
* | Merge topic 'cmp0082-exclude-from-all' into release-3.20Brad King2021-05-257-8/+8
|\ \ | |/ |/| | | | | | | | | 38f2562d5b CMP0082: Check EXCLUDE_FROM_ALL property at generate time Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6158
| * CMP0082: Check EXCLUDE_FROM_ALL property at generate timeKyle Edwards2021-05-247-8/+8
|/ | | | Fixes: #22234
* Merge topic 'git-config-version-check' into release-3.20Brad King2021-05-211-3/+5
|\ | | | | | | | | | | | | 8a9753e427 ExternalProject: Only add git config setting with git 1.7.7 or later Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6145
| * ExternalProject: Only add git config setting with git 1.7.7 or laterCraig Scott2021-05-201-3/+5
|/ | | | | | | | 1cb65e680d (ExternalProject: Prevent the noisy detached head messages on checkout, 2021-01-17) unconditionally added the advice.detachedHead git config setting, but it requires git 1.7.7 or later. Since it isn't fatal to not have it, just noisier, only add it when it is supported. Fixes: #22206
* Merge topic 'nvhpc-ninja-depfile' into release-3.20Brad King2021-05-192-0/+18
|\ | | | | | | | | | | | | | | 364f6af1d7 NVHPC: Support Ninja dependency scanning 521cfc38a3 NVHPC: Support explicit language flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6136
| * NVHPC: Support Ninja dependency scanningRobert Maynard2021-05-182-0/+10
| | | | | | | | Fixes: #22168
| * NVHPC: Support explicit language flagsRobert Maynard2021-05-182-0/+8
| |
* | Merge topic 'sphinx-4' into release-3.20Brad King2021-05-141-0/+1
|\ \ | | | | | | | | | | | | | | | | | | bb9c69ed70 Utilities/Sphinx: Update man page config for Sphinx 4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6126
| * | Utilities/Sphinx: Update man page config for Sphinx 4Brad King2021-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Sphinx 4 by default generates `man/#/foo.#`, but older versions generate `man/foo.#` as our install rules expect. Update our Sphinx config file to tell Sphinx 4 to use the old layout. Fixes: #22192
* | | Merge topic 'cmake_build_and_install_command_error_when_given_bad_arguments' ↵Brad King2021-05-1415-11/+60
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | into release-3.20 f78b167a23 cmCommandLineArgument: Provide more information syntax error messages 5aa0dec6b0 cmake: `--build` and `--install` error out when encountering bad flags 928cdb17c5 cmCommandLineArgument: Correctly record parsing failures Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6119
| * | cmCommandLineArgument: Provide more information syntax error messagesRobert Maynard2021-05-133-5/+6
| | |
| * | cmake: `--build` and `--install` error out when encountering bad flagsRobert Maynard2021-05-1314-2/+54
| | | | | | | | | | | | Fixes #22186
| * | cmCommandLineArgument: Correctly record parsing failuresRobert Maynard2021-05-121-6/+2
| |/
* | Merge topic 'ninja-fortran-symlink' into release-3.20Brad King2021-05-131-6/+5
|\ \ | | | | | | | | | | | | | | | | | | 3a71534402 Ninja: Restore support for Fortran in a symlinked build tree Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6120
generated by cgit v0.12 at 2025-02-01 10:38:21 (GMT)