summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Autogen: Restore mocs_compilation in OBJECT librariesBrad King2021-04-201-0/+5
| | | | | | | | | Since commit f65f20938c (Autogen: Avoid processing CSharp targets, 2020-11-12, v3.20.0-rc1~301^2) we collect all sources for a target earlier than previously. Clear the sources cache so that it will be re-computed later after AUTOGEN processing. Fixes: #22085
* Merge topic 'mrjoel/add-missing-not' into release-3.20Brad King2021-04-191-3/+3
|\ | | | | | | | | | | | | 370bebd921 Add missing 'not' in error messages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6012
| * Add missing 'not' in error messagesJoel Johnson2021-04-161-3/+3
| |
* | autogen: fix race in depfile parsingKyle Edwards2021-04-151-5/+6
|/ | | | | | | | cmReadGccDepfile() calls cmSystemTools::CollapseFullPath(), which is not thread safe due to internal caching. Serialize calls to cmReadGccDepfile() in autogen to avoid thread safety issues. Fixes: #22014
* OpenBSD: Fix system feature definitionsRafael Sadowski2021-04-144-10/+9
| | | | | | | | Since commit f034b0f663 (CMake compilation: do not use compiler extensions, 2020-03-14, v3.18.0-rc1~494^2), some sources explicitly enable needed system APIs on some platforms using definitions like `_POSIX_C_SOURCE` and `_XOPEN_SOURCE`. Drop the definitions for OpenBSD, which provides the POSIX APIs by default.
* CMake 3.20.1v3.20.1Brad King2021-04-081-1/+1
|
* Merge topic 'genex-HOST_LINK-in-try_compile' into release-3.20Brad King2021-04-011-2/+11
|\ | | | | | | | | | | | | 6cf81efe7d Genex: $<HOST_LINK:> and $<DEVICE_LINK:> must be usable in try_compile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5964
| * Genex: $<HOST_LINK:> and $<DEVICE_LINK:> must be usable in try_compileMarc Chevrier2021-03-311-2/+11
| | | | | | | | Fixes: #22007
* | Merge topic 'CUDA-device-link' into release-3.20Brad King2021-04-011-8/+52
|\ \ | | | | | | | | | | | | | | | | | | bb96984ec9 CUDA Device link: Ensure all link options are correctly formatted Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5962
| * | CUDA Device link: Ensure all link options are correctly formattedMarc Chevrier2021-03-311-8/+52
| |/ | | | | | | Fixes: #21994
* | Merge topic 'make-fix-deps-paths' into release-3.20Brad King2021-04-011-1/+13
|\ \ | |/ |/| | | | | | | | | 1b346350af Makefiles dependencies: normalize windows paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5955
| * Makefiles dependencies: normalize windows pathsMarc Chevrier2021-03-301-1/+13
| | | | | | | | Fixes: #21997
* | Merge topic 'ninja-automoc-cycle' into release-3.20Brad King2021-03-302-3/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ca7c76269b Tests: Add test for Ninja automoc dependency cyle 54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jörg Bornemann <joerg.bornemann@qt.io> Acked-by: Craig Scott <craig.scott@crascit.com> Merge-request: !5956
| * | autogen: Don't include SKIP_AUTOMOC files in depfileKyle Edwards2021-03-292-3/+10
| |/ | | | | | | | | | | | | SKIP_AUTOMOC files should not be included in moc processing, which means they shouldn't be included in the depfile either. Remove them. Fixes: #21977
* | Merge topic 'nmc-cc-no-output' into release-3.20Brad King2021-03-301-0/+5
|\ \ | |/ |/| | | | | | | | | | | | | 6dd89529e8 Ninja Multi-Config: Fix crash on custom command config with no output e21a80e97d Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja output Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5950
| * Ninja Multi-Config: Fix crash on custom command config with no outputBrad King2021-03-291-0/+5
| | | | | | | | | | | | | | | | With generator expressions in a custom command's `OUTPUT` and `BYPRODUCTS`, it is possible to have no outputs at all for a particular configuration. Generate no rule in this case. Fixes: #21989
* | Merge topic 'commands-file-permissions' into release-3.20Brad King2021-03-292-14/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 769ff05483 Help: Clarify permission-related command options 900184616a Cleanup: Fix misspelt name of local C++ variable 635431a0c9 Tests: Check host platform instead of target for running stat 4ceb0ca59e Tests: Remove redundant files for configure_file() tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5945
| * | Cleanup: Fix misspelt name of local C++ variableCraig Scott2021-03-262-14/+14
| | |
* | | Merge topic 'correct_arg_parsing' into release-3.20Brad King2021-03-291-5/+9
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 79d7bcaf40 cmCommandLineArgument: correctly compute next parse index Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5936
| * | cmCommandLineArgument: correctly compute next parse indexRobert Maynard2021-03-261-5/+9
| |/ | | | | | | | | | | | | Fixes #21966 Correctly compute the next parse index for `ZeroOrOne` when it is zero, and for OneOrMore.
* | Ninja Multi-Config: Include configs in long CC scriptsKyle Edwards2021-03-251-0/+6
| | | | | | | | Fixes: #21973
* | CPack: Validate and document NSIS branding text trim positionsCraig Scott2021-03-241-3/+10
|/
* CMake 3.20.0v3.20.0Brad King2021-03-231-1/+1
|
* CMP0118: Fix NEW behavior when looking up target sourcesBrad King2021-03-181-3/+14
| | | | | | | | | | Under the CMP0118 NEW behavior, sources generated in one directory should be visible when added to targets in other directories. This was accidentally left out of commit 6624b65b3f (GENERATED prop: Add implementation for policy CMP0118 being set to NEW, 2020-11-09, v3.20.0-rc1~393^2~1). Fixes: #18399
* CMake 3.20.0-rc5v3.20.0-rc5Brad King2021-03-171-1/+1
|
* Merge topic 'ninja-regenerate-no-recompact' into release-3.20Brad King2021-03-171-2/+3
|\ | | | | | | | | | | | | | | 6fd9c68ed0 Ninja: Do not recompact deps log in regeneration during a build Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5916
| * Ninja: Do not recompact deps log in regeneration during a buildBrad King2021-03-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit fb18215904 (Ninja: clean ninja metadata once generated, 2019-05-13, v3.17.0-rc1~207^2) we recompact the ninja deps log during regeneration. That does not make sense during a build, so skip it if we are regenerating during a build. This problem went unnoticed previously because on non-Windows platforms the deps log is just overwritten again by the outer build. On Windows platforms, recompaction during the build fails, but we did not actually try to do that until commit 11f4259362 (Ninja: Clean metadata after regen during build on Windows with 1.10.2+, 2020-11-30, v3.19.2~29^2~1). Fixes: #21916
| * CMake 3.19.7v3.19.7Brad King2021-03-151-1/+1
| |
* | Fail at read-time if configurePreset field invalidSam Freed2021-03-152-4/+13
| |
* | 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
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|