summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-toolset-version' into release-3.20Brad King2021-03-155-96/+142
|\ | | | | | | | | | | | | | | | | 30c835428f VS: Accept and translate '-T version=' values with three components 58a50a3a0a VS: Fix '-T version=14.28' under VS 16.9 09f59da7f0 cmGlobalVisualStudioVersionedGenerator: Clarify local variable name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5903
| * VS: Accept and translate '-T version=' values with three componentsBrad King2021-03-121-0/+37
| | | | | | | | | | | | | | | | The VS 16.8 and VS 16.9 toolset versions differ only in their third component. The `vcvarsall` option `-vcvars_ver=` accepts a three component version, so accept this format for VS toolset selection too. Issue: #21922
| * VS: Fix '-T version=14.28' under VS 16.9Brad King2021-03-125-91/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake accepts the toolset version that is default in the current VS version by matching the name later VS versions will use for the SxS props files. It predicts the future name based on the first two components of the current VS version's default toolset. However, this heuristic breaks naming the VS 16.8 toolset version 14.28 under VS 16.9 because the latter's default toolset version is 14.28.29910, which did not increment the second version component (unprecedented in VS). Fix this by always using the requested version's SxS props file when it exists, even if it matches the first two components of the current VS version's default toolset. Also add a special case for the name VS 16.10 will use for VS 16.9's default toolset, so that it can be used with VS 16.9 too. Fixes: #21922
| * cmGlobalVisualStudioVersionedGenerator: Clarify local variable nameBrad King2021-03-121-5/+5
| |
* | CMake 3.20.0-rc4v3.20.0-rc4Brad King2021-03-111-1/+1
| |
* | Merge topic 'xcode-framework-quoting' into release-3.20Brad King2021-03-111-1/+1
|\ \ | |/ | | | | | | | | | | 4f9a71974e Xcode: Restore support for spaces in framework names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5899
| * Xcode: Restore support for spaces in framework namesBrad King2021-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | In commit ce2dee9e5b (Xcode: Don't add framework as -framework argument in linker info list, 2020-09-28, v3.19.0-rc1~47^2) we split up the path to a framework into the directory and framework name parts, but only retained the quoting on the directory part. Restore quoting of the framework name. Fixes: #21910
| * CMake 3.19.6v3.19.6Brad King2021-02-241-1/+1
| |
* | cmake-gui: Restore search bar case insensitivityBrad King2021-03-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since these changes: * commit f1de6f6682 (cmake-gui: Support building against Qt6, 2020-12-17, v3.20.0-rc1~205^2~7) * commit 134d69121e (cmake-gui: Restore search bar for cache view and environment dialog, 2021-02-22, v3.20.0-rc2~12^2) the search bar is no longer case insensitive when using Qt 5.12.[0-1], and possibly some later versions. It works as of Qt 5.15 though, so update our version check accordingly. Fixes: #21884
* | CMake 3.20.0-rc3v3.20.0-rc3Brad King2021-03-031-1/+1
| |
* | CMake 3.20.0-rc2v3.20.0-rc2Brad King2021-02-241-1/+1
| |
* | Merge topic 'preset-flag-consistency' into release-3.20Brad King2021-02-243-5/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 6fa3647023 ctest: Add support for '--prefix=<prefix>' form of the argument 3357d37761 cmake: Add support for '--build --prefix=<prefix>' form of the argument 2f13fdef0a cmake: Document '--preset <preset>' form of the argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5849
| * | ctest: Add support for '--prefix=<prefix>' form of the argumentBrad King2021-02-232-3/+10
| | | | | | | | | | | | | | | | | | | | | The main `cmake --preset` argument for configure presets supports both forms, so support it for `ctest --preset` too. Fixes: #21855
| * | cmake: Add support for '--build --prefix=<prefix>' form of the argumentBrad King2021-02-231-1/+2
| | | | | | | | | | | | | | | | | | | | | The main `cmake --preset` argument for configure presets supports both forms, so support it for `cmake --build --preset` too. Issue: #21855
| * | cmake: Document '--preset <preset>' form of the argumentBrad King2021-02-231-1/+1
| | | | | | | | | | | | | | | | | | This form already works. Document it and add tests. Issue: #21855
* | | Merge topic 'LINK_LANGUAGE-genex-respects-LINKER_LANGUAGE-property' into ↵Brad King2021-02-241-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.20 b722eea925 Genex: LINK_LANGUAGE respects LINKER_LANGUAGE property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5841
| * | | Genex: LINK_LANGUAGE respects LINKER_LANGUAGE propertyMarc Chevrier2021-02-231-1/+5
| |/ / | | | | | | | | | | | | | | | | | | If target property LINKER_LANGUAGE is set, LINK_LANGUAGE generator expression evaluation must be always successful. This fix can be helpful to elaborate a solution for issue #21818.
* | | Merge topic 'autogen-cmp0116-fix' into release-3.20Brad King2021-02-2419-147/+192
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN cf34011ce7 Tests: Test per-CC behavior of CMP0116 3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5848
| * | | Ninja: Use CMP0116 status recorded at time of custom command's creationKyle Edwards2021-02-231-2/+2
| | | |
| * | | cmCustomCommand: Record value of CMP0116 at time of creationKyle Edwards2021-02-2318-145/+190
| | | |
* | | | Merge branch 'backport-3.19-preset-no-comments' into preset-no-commentsBrad King2021-02-241-0/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | CMakePresets.json: Remove undocumented support for commentsKyle Edwards2021-02-241-0/+1
| | | | | | | | | | | | Fixes: #21858
| * | CMake 3.19.5v3.19.5Brad King2021-02-151-1/+1
| | |
* | | Merge topic 'cmake-gui-restore-search' into release-3.20Brad King2021-02-232-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 134d69121e cmake-gui: Restore search bar for cache view and environment dialog Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5845
| * | | cmake-gui: Restore search bar for cache view and environment dialogSankhesh Jhaveri2021-02-222-0/+10
| | |/ | |/| | | | | | | | | | | | | | | | This was broken by commit f1de6f6682 (cmake-gui: Support building against Qt6, 2020-12-17, v3.20.0-rc1~205^2~7). Fixes: #21850
* | | Merge topic 'per-config-autogen-info-file' into release-3.20Brad King2021-02-232-4/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | a3df25c694 Autogen: Don't change the order of HEADERS array in AutogenInfo.json Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5840
| * | Autogen: Don't change the order of HEADERS array in AutogenInfo.jsonCraig Scott2021-02-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt6 reads our internal AutogenInfo.json file. In 92d7b456e5 (Autogen: Add support for per-config sources, 2020-10-20), the ordering of the HEADERS array elements was changed and this broke their cmake_automoc_parser. We don't need to change the order of the array elements, we can append to the existing ones instead. Do this to allow their cmake_automoc_parser to continue to work. Fixes: #21823
* | | Merge topic 'vs-pch-one-lang' into release-3.20Brad King2021-02-221-7/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9945b3b565 VS: Restore support for PCH in CXX but not C within once target d9fd32b3b3 cmVisualStudio10TargetGenerator: Refactor per-source PCH logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5836
| * | | VS: Restore support for PCH in CXX but not C within once targetBrad King2021-02-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic from commit 9df1f33c9a (VisualStudio: move PCH rules to projects when possible., 2020-10-15, v3.20.0-rc1~638^2) to explicitly disable PCH on sources that should not use the target-wide PCH rules. Fixes: #21827
| * | | cmVisualStudio10TargetGenerator: Refactor per-source PCH logicBrad King2021-02-191-6/+6
| |/ / | | | | | | | | | De-duplicate the link language lookup.
* | | Merge topic 'cpackifw-scanbuild-fix' into release-3.20Brad King2021-02-221-2/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 90c2f138ee CPackIFWInstaller: Avoid potential null pointer dereference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5832
| * | CPackIFWInstaller: Avoid potential null pointer dereferenceCraig Scott2021-02-191-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | In d16830324f (CPackIFW: Improve warning and docs for show page list option, 2021-02-14), code was added to report the current QtIFW version. That code didn't check that there was a Generator object before using it, resulting in a scanbuild warning about a potential null pointer dereference. Add a check and output a more general warning message if we don't have the current QtIFW version available to report.
* | | bindexplib: remove stray debugging output when using llvm-nmBrad King2021-02-181-1/+0
|/ / | | | | | | | | | | Remove a debugging message left by commit c856d4556b (bindexplib: supporting llvm bitcode formats using llvm-nm, 2019-08-13, v3.16.0-rc1~161^2~1).
* | CMake 3.20.0-rc1v3.20.0-rc1Brad King2021-02-161-1/+1
| |
* | presets: Inherit 'quiet' property for test presetsSam Freed2021-02-151-0/+1
| | | | | | | | This was missed in the original implementation.
* | presets: Remove unintended rerunFailed option from test presetsSam Freed2021-02-153-9/+0
| | | | | | | | | | | | | | This was accidentally included after discussion in #21391 had decided to leave it out. It was never included in a release. Issue: #21391
* | Merge topic 'release-3.20-cleanups' into release-3.20Brad King2021-02-151-6/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c147b21c7 Help: Add Ninja Multi-Config and make generator types into links 5039ca1126 Help: Convert output directory variable mentions to cross-references 1a7e51b9d5 Help: Cleanup wording and links in 3.20 release notes d16830324f CPackIFW: Improve warning and docs for show page list option 7ed7db88a4 CPackIFW: Fix cppcheck warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5810
| * | CPackIFW: Improve warning and docs for show page list optionCraig Scott2021-02-141-3/+5
| | |
| * | CPackIFW: Fix cppcheck warningsCraig Scott2021-02-141-3/+4
| | | | | | | | | | | | | | | | | | The cppcheck warnings about uninitialised variables are likely harmless, since they are initialised in ParseResource() anyway. Fix the warnings anyway to reduce linting noise. The warning about a single argument non-explicit constructor is worth fixing in general.
* | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-02-101-92/+154
|/ / | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-02-10 (dda7a943)
* | Begin 3.20 release versioningBrad King2021-02-101-3/+3
| |
* | Merge topic 'ctest-dashboard-with-modified-files'Brad King2021-02-101-1/+1
|\ \ | |/ | | | | | | | | | | 33fa015b4a CTest: Restore running dashboard client Test step with modified files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5791
| * CTest: Restore running dashboard client Test step with modified filesBrad King2021-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 6a6f1d1edd (CTest: exit nonzero after message(SEND_ERROR|FATAL_ERROR), 2020-04-03, v3.19.0-rc1~260^2), `ctest` no longer runs tests if there are errors before the full set of tests is defined. Such errors were previously treated more like warnings. The change exposed some cases where we were issuing an error message but proceeding to run tests anyway. The above commit downgraded one such case (missing `DartConfiguration.tcl`) to a warning explicitly in order to restore its former warning-like semantics. Downgrade the Update step's diagnostic about modified or conflicting files to a warning for the same reason. Fixes: #21783
| * Merge topic 'xcode12-ios_install_combined' into release-3.19Brad King2021-02-094-4/+62
| |\ | | | | | | | | | | | | | | | | | | 0110aa018d IOS_INSTALL_COMBINED: Support Xcode 12 (command line only) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5785
| * \ Merge topic 'lexer-posix-source' into release-3.19Brad King2021-02-081-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8b41e2c68 LexerParser: Do not override existing _POSIX_C_SOURCE definition 82cfeeb484 Merge branch 'backport-3.18-ci-wix-download' into release-3.18 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5776
* | | | CMake Nightly Date StampKitware Robot2021-02-101-1/+1
| | | |
* | | | Merge topic 'xcode12-ios_install_combined'Brad King2021-02-094-4/+62
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 0110aa018d IOS_INSTALL_COMBINED: Support Xcode 12 (command line only) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5785
| * | | IOS_INSTALL_COMBINED: Support Xcode 12 (command line only)Craig Scott2021-02-084-4/+62
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 12 doesn't allow nested builds within the same build directory. That means we can no longer do an install by building the install target when IOS_INSTALL_COMBINED is true. We can, however, still do an install by running the cmake_install.cmake script or executing cmake --install, since there is no outer build and therefore the associated SDK can be built as a sub-build. The non-build methods previously didn't work when IOS_INSTALL_COMBINED was true because the generated install script and the CMakeIOSInstallCombined script both made certain assumptions that relied on being part of a build. Those assumptions are now removed. A side-effect of this work is that cpack now also works from the command line when IOS_INSTALL_COMBINED is true. Relates: #21282 Fixes: #20023
* | | Merge topic 'object-lib-multiarch'Brad King2021-02-091-10/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d46b1401f add_library(): Allow imported object libraries with multi-arch 1a915e8953 Tests: TargetObjects does not need any languages enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5771
| * | | add_library(): Allow imported object libraries with multi-archCraig Scott2021-02-061-10/+0
| | | | | | | | | | | | Fixes: #21276
generated by cgit v0.12 at 2025-02-07 16:43:56 (GMT)