summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.24'Brad King2022-08-170-0/+0
|\
| * Merge topic 'FindVulkan-tolerate-FATAL_ERROR' into release-3.24Brad King2022-08-172-0/+15
| |\ | | | | | | | | | | | | | | | | | | | | | 9063674517 Help: Add 3.24 release note about FindVulkan component enforcement bc01362368 FindVulkan: Restore tolerance of unknown FATAL_ERROR component Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7583
* | \ Merge topic 'FindVulkan-tolerate-FATAL_ERROR'Brad King2022-08-172-0/+15
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 9063674517 Help: Add 3.24 release note about FindVulkan component enforcement bc01362368 FindVulkan: Restore tolerance of unknown FATAL_ERROR component Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7583
| * | Help: Add 3.24 release note about FindVulkan component enforcementBrad King2022-08-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Since commit 6e4d20921d (FindVulkan: Add component for `shaderc_combined`, 2022-05-18, v3.24.0-rc1~111^2~5), the module rejects unknown components. Add a release note about this behavior change. Issue: #23849
| * | FindVulkan: Restore tolerance of unknown FATAL_ERROR componentBrad King2022-08-171-0/+10
| |/ | | | | | | | | | | | | | | | | | | | | `find_package(Vulkan REQUIRED FATAL_ERROR)` calls exist in the wild, but `find_package` does not have a `FATAL_ERROR` option. We silently tolerated such calls prior to commit 6e4d20921d (FindVulkan: Add component for `shaderc_combined`, 2022-05-18, v3.24.0-rc1~111^2~5), by treating the argument as a component and ignoring it. Restore tolerance by removing the component and warning about it. Fixes: #23849
* | Merge topic 'fix-gcov-test'Brad King2022-08-171-2/+3
|\ \ | | | | | | | | | | | | | | | | | | 0ccaa7ecb9 Tests: Fix GCOV test in unusual environments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7580
| * | Tests: Fix GCOV test in unusual environmentsMatthew Woehlke2022-08-161-2/+3
| | | | | | | | | | | | | | | Tweak path computation in CTestCoverageCollectGCOV test so that the test doesn't spuriously fail if the build directory is a symlink.
* | | Merge topic 'output_all_attempts_at_compiler_detection'Brad King2022-08-171-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c5bd7fe3a CompilerId: Output errors from all attempts at detection Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7576
| * | | CompilerId: Output errors from all attempts at detectionRobert Maynard2022-08-161-2/+6
| | | | | | | | | | | | | | | | | | | | Instead of printing the output of the last attempt, print the output of all attempts. This shows users that CMake isn't ignoring any provided flags ( LANG_FLAGS ).
* | | | Merge topic 'fix-xcode-install-path'Brad King2022-08-171-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61acaa12af xcode: Don't set INSTALL_PATH unless target is SHARED_LIBRARY Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7473
| * | | | xcode: Don't set INSTALL_PATH unless target is SHARED_LIBRARYTor Arne Vestbø2022-08-161-3/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An empty INSTALL_PATH will confuse Xcode, resulting in the archive action producing archives that can not be uploaded to the App Store. The logic to pull out a install_name_dir only applies to SHARED_LIBRARY targets, so we can skip the setting of the property for all other targets. There might be cases where the INSTALL_PATH code path will also end up setting an empty INSTALL_PATH, but it's unclear whether this is a problem, so to keep the patch minimal the existing code is left as is. Fixes: #15183
* | | | Merge branch 'release-3.24'Brad King2022-08-170-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'ci-msvc-14.33' into release-3.24Brad King2022-08-171-7/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f17996edc gitlab-ci: Update Windows builds to MSVC 14.33 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7578
* | \ \ \ Merge topic 'ci-msvc-14.33'Brad King2022-08-171-7/+7
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 6f17996edc gitlab-ci: Update Windows builds to MSVC 14.33 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7578
| * | | | gitlab-ci: Update Windows builds to MSVC 14.33 toolsetBrad King2022-08-161-7/+7
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2022-08-171-1/+1
| |/ / |/| |
* | | Merge topic 'refactor-environment-modification'Brad King2022-08-1610-134/+208
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5d45e685f Tests: Add case for ENVIRONMENT_MODIFICATION property OP=reset behavior e2854b4fa2 cmCTestRunTest: Implement the ENVIRONMENT test property with EnvDiff too bfa1c5285b cmSystemTools: Add EnvDiff class to hold ENVIRONMENT_MODIFICATION logic a0b1c4ee90 cmCTestRunTest: Simplify by using GetSystemPathlistSeparator 4e6cbb1f13 cmCTestRunTest: Remove unnecessary CMAKE_BOOTSTRAP guard Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7572
| * | | Tests: Add case for ENVIRONMENT_MODIFICATION property OP=reset behaviorAlex Reinking2022-08-157-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When processing the reset operation in the context of a CTest `ENVIRONMENT_MODIFICATION` property, the value the variable is reset to is the one it had after `ENVIRONMENT` was processed, not before. This was broken once during refactoring and is subtle enough that it should be tested.
| * | | cmCTestRunTest: Implement the ENVIRONMENT test property with EnvDiff tooAlex Reinking2022-08-153-13/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Going through the same internal API for both `ENVIRONMENT` and `ENVIRONMENT_MODIFICATION` properties will make it easier to implement checkpointing for `MYVAR=reset:` more efficiently if the need ever presents itself. It also makes the two-stage nature of the environment mutation clearer in the code itself.
| * | | cmSystemTools: Add EnvDiff class to hold ENVIRONMENT_MODIFICATION logicAlex Reinking2022-08-153-121/+154
| | | | | | | | | | | | | | | | Prepare to re-use this logic when enhancing `cmake -E env`.
| * | | cmCTestRunTest: Simplify by using GetSystemPathlistSeparatorAlex Reinking2022-08-151-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | Part of the implementation of `ENVIRONMENT_MODIFICATION` replicated the logic in this function. Using it here de-duplicates code and will be useful during the upcoming refactoring.
| * | | cmCTestRunTest: Remove unnecessary CMAKE_BOOTSTRAP guardAlex Reinking2022-08-151-2/+0
| | | | | | | | | | | | | | | | CTest is not compiled during CMake's `bootstrap` build.
* | | | Merge topic 'nvhpc_fpie_support'Brad King2022-08-161-7/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52dc49deb9 NVHPC: Enable PIE support on linux Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !7564
| * | | | NVHPC: Enable PIE support on linuxRobert Maynard2022-08-151-7/+9
| | | | |
* | | | | Merge topic 'tutorial_step1_update'Brad King2022-08-164-102/+398
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 953d729622 Tutorial: Collapse step 1 solutions c59e164155 Tutorial: Add Step 1 background info and update style Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7497
| * | | | | Tutorial: Collapse step 1 solutionsMarkus Ferrell2022-08-151-0/+87
| | | | | |
| * | | | | Tutorial: Add Step 1 background info and update styleMarkus Ferrell2022-08-154-104/+313
| | | | | |
* | | | | | Merge topic 'doc-compiler-id-table'Brad King2022-08-161-37/+54
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8430527f3 Help: `CMAKE_<LANG>_COMPILER_ID` turn code block into table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7567
| * | | | | | Help: `CMAKE_<LANG>_COMPILER_ID` turn code block into tableAlex Turbov2022-08-151-37/+54
| | | | | | |
* | | | | | | Merge topic 'xcode-avoid-compile-flags-on-resources'Brad King2022-08-161-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b2359ac53 Xcode: don't set SKIP_PRECOMPILE_HEADERS when source has no language Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Acked-by: Cristian Adam <cristian.adam@gmail.com> Merge-request: !7562
| * | | | | | | Xcode: don't set SKIP_PRECOMPILE_HEADERS when source has no languageAndrey Filipenkov2022-08-111-1/+3
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resources that should go into "Copy Bundle Resources" build phase are added as source files but don't have an associated language Fixes: #23821
* | | | | | | Merge topic 'doc-cmake-cli-options'Brad King2022-08-1617-350/+221
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0224576995 Help: Replace `cmake -P` option mentions w/ Sphinx role 1b94770f27 Help: Insert link to `cmake --toolchain` option 2c54cd871a Help: Turn items of presets manual page into description list e2198fd9dc Help: Format `-Werror`/`-Wno-error` in the way it can be referenced a6070b480f Help: Use placeholder instead of listing choices in option lines 8ba20cb56f Help: Simplify `cmake --log-level` option definition 146e4e6bad Help: Split `ctest` options into groups like `cmake` man page has 4c1008d739 Help: Use `:option:` role to reference `ctest` options ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7554
| * | | | | | | Help: Replace `cmake -P` option mentions w/ Sphinx roleAlex Turbov2022-08-144-4/+4
| | | | | | | |
| * | | | | | | Help: Insert link to `cmake --toolchain` optionAlex Turbov2022-08-141-1/+2
| | | | | | | |
| * | | | | | | Help: Turn items of presets manual page into description listAlex Turbov2022-08-141-154/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was an ordinal paragraphs (`<p>`) intermixed with blockquote elements.
| * | | | | | | Help: Format `-Werror`/`-Wno-error` in the way it can be referencedAlex Turbov2022-08-142-28/+30
| | | | | | | | | | | | | | | | | | | | | | | | Replace mentions of these options in the presets manual page.
| * | | | | | | Help: Use placeholder instead of listing choices in option linesAlex Turbov2022-08-143-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids any ambiguity with whether the choices are literal values or not. It also makes the option lines more concise.
| * | | | | | | Help: Simplify `cmake --log-level` option definitionAlex Turbov2022-08-141-3/+4
| | | | | | | |
| * | | | | | | Help: Split `ctest` options into groups like `cmake` man page hasAlex Turbov2022-08-142-91/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Craig Scott <craig.scott@crascit.com>
| * | | | | | | Help: Use `:option:` role to reference `ctest` optionsAlex Turbov2022-08-142-2/+2
| | | | | | | |
| * | | | | | | Help: Simplify optional repeating optionAlex Turbov2022-08-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar form has already been used in the `ctest -M <mode> [-T <step>]...` synopsis and looks quite clean w/o extra characters.
| * | | | | | | Help: Short options first, then long, then Windows styleAlex Turbov2022-08-145-7/+7
| | | | | | | |
| * | | | | | | Help: `{<…> | <…>}` → `<…|…>`Alex Turbov2022-08-143-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The form of alternative names for "placeholders" has been used already (e.g., `<file|dir>` in the `cmake(1)` manual).
| * | | | | | | Help: Consistent spaces in option argsAlex Turbov2022-08-141-1/+1
| | | | | | | |
| * | | | | | | Help: `<f>` → `<file>` for `--help*` option descriptionsAlex Turbov2022-08-142-40/+42
| | | | | | | |
| * | | | | | | Help: Fix `ctest` options descriptionAlex Turbov2022-08-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missed empty line after `.. option::` and the next paragraph.
* | | | | | | | Merge branch 'release-3.24'Brad King2022-08-160-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge topic 'mingw-windres' into release-3.24Brad King2022-08-161-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9755bc7c1 MinGW: Restore using windres when toolchain-prefixed name is not available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7574
* | \ \ \ \ \ \ \ Merge topic 'mingw-windres'Brad King2022-08-161-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9755bc7c1 MinGW: Restore using windres when toolchain-prefixed name is not available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7574
| * | | | | | | | MinGW: Restore using windres when toolchain-prefixed name is not availableBrad King2022-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 55ba10dcfd (MSYS/MinGW Makefiles: Simplify selection of windres as Resource Compiler, 2022-05-26, v3.24.0-rc1~82^2) the `MinGW Makefiles` and `MSYS Makefiles` generators no longer specify the plain `windres` name for the MinGW resource compiler. Instead, the name is specified in our MinGW platform information module. After the change in commit af4adf6aa9 (MinGW: Fix default windres selection when cross-compiling, 2020-03-25, v3.18.0-rc1~492^2), when cross-compiling, we only specify the toolchain-prefixed name of the tool, which may not be available in all environments. If the toolchain-prefixed name is not available, fall back to the plain `windres` name. We already use this approach for other binutils. Fixes: #23841