summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'GoogleTest-discover-type-params' into release-3.23Brad King2022-02-086-36/+57
|\ | | | | | | | | | | | | | | | | 073dd1bd81 GoogleTest: Change format for typed tests f28f738bd2 GoogleTest: Fix type param tests for suites with many cases Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6958
| * GoogleTest: Change format for typed testsEvgeniy Shcherbina2022-02-075-45/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before it would output a typed test as follows: Suit/Type.Case And now it would be: Suit.Case<Type> In case of NO_PRETTY_TYPES it would simply use the type number instead of its text representation: Suit.Case<0> The change is introduced to make sure CTest outputs tests in a similar fashion which is "*Suit.Case*" and angle brackets "<>" emphasize that we are dealing with a typed (template) kind.
| * GoogleTest: Fix type param tests for suites with many casesEvgeniy Shcherbina2022-02-076-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there were many cases (two digits or more) the "prettier" would fail to recognize the pretty part leaving the test name unprocessed. The fix made sure the processing would work correctly, irrespective of the case number. Before the fix, for the following input: TypedSuite/1. # TypeParam = int case TypedSuite/10. # TypeParam = char case The output would be: TypedSuite/int.case TypedSuite/10. # TypeParam = char.case Now the output will be: TypedSuite/int.case TypedSuite/char.case
* | Merge topic 'doc-DESTDIR' into release-3.23Brad King2022-02-072-11/+30
|\ \ | | | | | | | | | | | | | | | | | | a9b8c9d33e Help: Clarify roles of DESTDIR and CMAKE_INSTALL_PREFIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6955
| * | Help: Clarify roles of DESTDIR and CMAKE_INSTALL_PREFIXBrad King2022-02-042-11/+30
|/ /
* | Merge branch 'release-3.22' into release-3.23Brad King2022-02-040-0/+0
|\ \
| * \ Merge branch 'default-extensions' into release-3.22Brad King2022-02-033-7/+4
| |\ \ | | | | | | | | | | | | Merge-request: !6949
* | \ \ Merge topic 'default-extensions' into release-3.23Brad King2022-02-043-7/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4ef6e27cb9 CompilerId: Fix default extensions check for Clang targeting MSVC ABI Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !6949
| * | | CompilerId: Fix default extensions check for Clang targeting MSVC ABIBrad King2022-02-033-7/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fc3a1cbdd8 (CompilerID: Compiler extensions default detection, 2021-05-29, v3.22.0-rc1~52^2~2), extensions were assumed to be `OFF` for Clang targeting the MSVC ABI. However, the `clang` and `clang++` tools both seem to have extensions enabled by default even when targeting the MSVC ABI. This can be observed with the `RunCMake.CompileFeatures` test. It fails with the GNU-like `clang/clang++` front-end, but removing the above special case makes it pass. The test passes either way with the MSVC-like `clang-cl` front-end.
* | | Merge topic 'vs-simplify-pch' into release-3.23Brad King2022-02-041-9/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dd1e2cc80c VS: Simplify generation of per-source PCH settings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6950
| * | | VS: Simplify generation of per-source PCH settingsBrad King2022-02-031-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid looking up the PCH create/use flags just to map them through flag tables back to the `.vcxproj` settings. Instead, simply generate the PCH settings directly for each source file. Since commit 9df1f33c9a (VisualStudio: move PCH rules to projects when possible., 2020-10-15, v3.20.0-rc1~638^2) we already do this for the target-wide PCH settings.
* | | | Merge topic 'ep-patch-USES_TERMINAL' into release-3.23Brad King2022-02-047-11/+37
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | cbb87e0a2c ExternalProject: Add support for USES_TERMINAL_PATCH keyword Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6940
| * | | ExternalProject: Add support for USES_TERMINAL_PATCH keywordCraig Scott2022-02-037-11/+37
| |/ / | | | | | | | | | | | | | | | | | | This brings the patch step into line with all the others which already had their own `USES_TERMINAL_<step>` keyword. All steps (including patch) already have their own `LOG_<step>` keyword too, so the lack of `USES_TERMINAL_PATCH` was inconsistent.
* | | Merge topic 'GoogleTest-discover-spaces-in-parameters' into release-3.23Brad King2022-02-044-5/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fd6b8fa40e GoogleTest: Preserve spaces in test parameters Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6941
| * | | GoogleTest: Preserve spaces in test parametersEvgeniy Shcherbina2022-02-034-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the fix the gtest_discover_tests() function would strip the user data in test parameters (everything to the right of GetParam()) of spaces. Now the parameters aren't altered in any way. Fixes #23058
* | | | Merge topic 'test-mfc-explicit' into release-3.23Brad King2022-02-047-111/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d621ceba1 Tests: Run MFC test only when explicitly enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6943
| * | | | Tests: Run MFC test only when explicitly enabledBrad King2022-02-037-111/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we used a complicated heuristic to decide whether or not to run the MFC test, but it sometimes decided incorrectly to run the test. Since that was first written, we have developed a convention for other tests to enable them via undocumented cache entries that are added only on machines known to meet the tests' requirements. Do that for MFC.
* | | | | Merge topic 'rel-version' into release-3.23Brad King2022-02-042-4/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd11d78dfc Help/dev: Clarify maintainer guide step for DEVEL_CMAKE_VERSION d184bf0659 Replace DEVEL_CMAKE_VERSION with literal 3.23 release version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6951
| * | | | | Help/dev: Clarify maintainer guide step for DEVEL_CMAKE_VERSIONBrad King2022-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous wording could be misread as ensuring the arguments to the call match the release version. Clarify that one needs to remove the call and replace it with the literal release version string.
| * | | | | Replace DEVEL_CMAKE_VERSION with literal 3.23 release versionBrad King2022-02-041-2/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally left out of commit 736663deed (Begin 3.23 release versioning, 2022-02-03). The step is documented as part of the release branching process in the CMake Maintainer Guide `Help/dev/maint.rst`.
* | | | | Merge topic 'doc-cmcmd-versionadded' into release-3.23Brad King2022-02-031-11/+109
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 892c96dda0 Help: add versionadded markup to cmake -E commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6946
| * | | | | Help: add versionadded markup to cmake -E commandsPeter Würth2022-02-031-11/+109
| | |_|/ / | |/| | |
* | | | | Merge topic 'ci-minor-cleanups' into release-3.23Brad King2022-02-034-3/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 040c509bce gitlab-ci: clarify name of windows fragment for building with ninja bd14f07ce9 Tests: Skip Clang PCH_INSTANTIATE_TEMPLATES test in MSVC ABI c26b064b8c Tests: Suppress MSVC CRT deprecation warnings in pseudo_llvm-rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6947
| * | | | | gitlab-ci: clarify name of windows fragment for building with ninjaBrad King2022-02-021-2/+2
| | | | | |
| * | | | | Tests: Skip Clang PCH_INSTANTIATE_TEMPLATES test in MSVC ABIBrad King2022-02-022-1/+3
| | | | | |
| * | | | | Tests: Suppress MSVC CRT deprecation warnings in pseudo_llvm-rcBrad King2022-02-021-0/+4
| | |/ / / | |/| | |
* | | | | Begin 3.23 release versioningBrad King2022-02-031-3/+3
| | | | |
* | | | | gitlab-ci: Drop package pipeline upload jobs for release branchBrad King2022-02-031-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | The package pipeline for release versions should not upload packages automatically to our archive of nightly development versions.
* | | | | Help: Drop development topic notes to prepare releaseBrad King2022-02-032-9/+0
| |/ / / |/| | | | | | | | | | | | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* | | | Merge topic 'doc-3.23-relnotes'Brad King2022-02-0348-295/+292
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9334b5bd7b Help: Update Sphinx versionadded directives for 3.23 release e61969c59e Help: Organize and revise 3.23 release notes f5bdea75a0 Help: Consolidate 3.23 release notes ef23e81544 Help: Remove stray leading blank lines from release notes 51aaea34d6 Help: Polish CMAKE{,_SYSTEM}_IGNORE_PREFIX_PATH documentation 23b1d8f03c CheckPIESupported: Document version adding support for more languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6936
| * | | | Help: Update Sphinx versionadded directives for 3.23 releaseBrad King2022-02-036-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the script: Utilities/Sphinx/update_versions.py --since v3.22.0 --overwrite Manually select updates that really belong to the 3.23 release, as against adding documentation for previously-existing entities.
| * | | | Help: Organize and revise 3.23 release notesBrad King2022-02-031-138/+190
| | | | | | | | | | | | | | | | | | | | | | | | | Add section headers similar to the 3.22 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * | | | Help: Consolidate 3.23 release notesBrad King2022-02-0341-271/+202
| | | | | | | | | | | | | | | | | | | | | | | | | Run the `Utilities/Release/consolidate-relnotes.bash` script to move notes from `Help/release/dev/*` into `Help/release/3.23.rst`.
| * | | | Help: Remove stray leading blank lines from release notesBrad King2022-02-033-3/+0
| | | | |
| * | | | Help: Polish CMAKE{,_SYSTEM}_IGNORE_PREFIX_PATH documentationBrad King2022-02-032-19/+19
| | | | |
| * | | | CheckPIESupported: Document version adding support for more languagesBrad King2022-02-031-2/+7
|/ / / /
* | | | Merge topic 'doc-imported-no-system'Brad King2022-02-035-12/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec29a6a1a9 Help: Clarify documentation on SYSTEM include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6942
| * | | | Help: Clarify documentation on SYSTEM include directoriesBrad King2022-02-035-12/+24
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention that system include directories are searched after normal include directories. Document that `IMPORTED_NO_SYSTEM` and `NO_SYSTEM_FROM_IMPORTED` do not affect `INTERFACE_SYSTEM_INCLUDE_DIRECTORIES`.
* | | | Merge topic 'cmake-ignore-prefix-path'Brad King2022-02-0316-38/+218
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 201d8c4298 find_*(): Add CMAKE_IGNORE_PREFIX_PATH variable bd805a51ae Refactor: Keep track of prefixes in cmSearchPath Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !6880
| * | | | find_*(): Add CMAKE_IGNORE_PREFIX_PATH variableKyle Edwards2022-02-0216-12/+165
| | | | | | | | | | | | | | | | | | | | Fixes: #20878
| * | | | Refactor: Keep track of prefixes in cmSearchPathKyle Edwards2022-02-024-27/+54
| |/ / /
* | | | Merge topic 'cmake-presets-configure-preset-reachability'Brad King2022-02-0312-3/+57
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | c18409cdac CMakePresets.json: Ensure configurePreset is reachable from current file Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6937
| * | | CMakePresets.json: Ensure configurePreset is reachable from current fileKyle Edwards2022-02-0212-3/+57
| |/ /
* | | CMake Nightly Date StampKitware Robot2022-02-031-1/+1
|/ /
* | Merge topic 'cuda_generic_arch_all'Brad King2022-02-027-124/+214
|\ \ | | | | | | | | | | | | | | | | | | | | | 8f64df0a7c CUDA: Generic all and all-major support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !6816
| * | CUDA: Generic all and all-major supportRaul Tambre2022-02-017-124/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 14d8a276 (CUDA: Support nvcc 11.5 new -arch=all|all-major flags, 2021-08-17) added all and all-major options to CUDA_ARCHITECTURES. These are fairly generic and likely to see real-world use by distributors. Thus it's desirable to support these also for Clang and older NVCC versions. The supported architectures are dependent on the toolkit version. We determine the toolkit version prior to compiler detection. For NVCC we get the version from the vendor identification output, but for Clang we need to invoke NVCC separately. The architecture information is mostly based on the Wikipedia list with the earliest supported version being CUDA 7.0. This could be documented and expanded in the future to allow projects to query CUDA toolkit version and architecture information. For Clang we additionally constrain based on its support. Additionally the architecture mismatch detection logic is fixed, improved and updated for generic support: * Commit 01428c55 (CUDA: Fail fast if CMAKE_CUDA_ARCHITECTURES doesn't work during detection, 2020-08-29) enabled CMAKE_CUDA_COMPILER_ID_REQUIRE_SUCCESS if CMAKE_CUDA_ARCHITECTURES is specified. This results in CMakeDetermineCompilerID.cmake printing the compiler error and our code for presenting the mismatch in a user-friendly way being useless. The custom logic seems preferable so go back to not enabling it. * Commit 14d8a276 (CUDA: Support nvcc 11.5 new -arch=all|all-major flags, 2021-08-17) tried to support CMP0054 but forgot to add x to the interpolated result. Thus the conditions would always evaluate to false. This is fixed as a byproduct of removing NVIDIA specific checks, improving the error message and replacing architectures_mode with a simpler architectures_explicit. Visual Studio support omits testing the flags during detection due to complexities in determining the toolkit version when using it. A long-term proper implementation would be #23161. Implements #22860.
* | | Merge topic 'dotnet_ref_in_sdk'Brad King2022-02-022-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5ee3154f65 VS: .Net SDK Style projects can add Reference to dlls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6932
| * | | VS: .Net SDK Style projects can add Reference to dllsSumit Bhardwaj2022-02-012-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When support for `DOTNET_SDK` was added, only a minimal set of options were built in. Based on user feedback, support for reference to dlls (not just projects) is needed. That support is added here. Fixes: #23166
* | | | Merge topic 'update-expat'Brad King2022-02-024-15/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 338240fd21 Merge branch 'upstream-expat' into update-expat 8e0070b905 expat 2022-01-30 (81b89678) f06a4c2406 expat: Update script to get Expat 2.4.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6933
| * \ \ \ Merge branch 'upstream-expat' into update-expatBrad King2022-02-013-14/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Expat Upstream * upstream-expat: expat 2022-01-30 (81b89678)