summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 'cray-version-patch' into release-3.20Brad King2021-03-311-0/+3
|\ \ | | | | | | | | | | | | | | | | | | 258faaeef6 Cray: Detect Fortran compiler version patch level if available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5957
| * | Cray: Detect Fortran compiler version patch level if availableJustin LaPolla2021-03-311-0/+3
|/ / | | | | | | Fixes: #21969
* | Merge topic 'android-binutils' into release-3.20Brad King2021-03-313-50/+52
|\ \ | | | | | | | | | | | | | | | | | | 61e6fc26bc Android: Fix search for binutils Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5958
| * | Android: Fix search for binutilsHaibo Huang2021-03-303-50/+52
|/ / | | | | | | | | | | | | | | Set `CMAKE_SYSTEM_PROGRAM_PATH` in `Platform/Android-Initialize` instead of `Platform/Android` so it can be used in `CMakeFindBinUtils`. Also add the names `llvm-strip` and `llvm-ranlib` for the corresponding tools.
* | Merge topic 'ninja-automoc-cycle' into release-3.20Brad King2021-03-308-20/+61
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Tests: Add test for Ninja automoc dependency cyleKyle Edwards2021-03-296-17/+51
| | |
| * | 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 'GNUInstallDirs-doc' into release-3.20Brad King2021-03-301-1/+4
|\ \ | | | | | | | | | | | | | | | | | | 06171fd7aa GNUInstallDirs: Clarify that CMAKE_INSTALL_<dir> may be absolute Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5947
| * | GNUInstallDirs: Clarify that CMAKE_INSTALL_<dir> may be absoluteBrad King2021-03-291-1/+4
| | | | | | | | | | | | Fixes: #21991
* | | Merge topic 'nmc-cc-no-output' into release-3.20Brad King2021-03-3011-2/+68
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 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-299-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja outputBrad King2021-03-292-2/+2
| |/ | | | | | | Ninja versions prior to 1.6.0 occasionally print this message.
* | Merge topic 'commands-file-permissions' into release-3.20Brad King2021-03-299-44/+61
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Help: Clarify permission-related command optionsCraig Scott2021-03-262-23/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous docs did not make clear that at most only one of the three permissions-related options can be given for configure_file() or file(GENERATE) and that USE_SOURCE_PERMISSIONS is already the default behavior for these commands. Use consistent wording to refer to the input and output files for configure_file(). Add missing "versionadded" directives on some of these keywords. Use the consistent wording and keyword ordering between the configure_file(), file(GENERATE) and file(COPY) commands.
| * | Cleanup: Fix misspelt name of local C++ variableCraig Scott2021-03-262-14/+14
| | |
| * | Tests: Check host platform instead of target for running statCraig Scott2021-03-263-7/+7
| | |
| * | Tests: Remove redundant files for configure_file() testsCraig Scott2021-03-262-0/+0
| | |
* | | Merge topic 'FindIntl-builtin' into release-3.20Brad King2021-03-292-41/+90
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e34d64c04d FindIntl: Fix detection of intl built in to C library cb0d1a49e6 FindIntl: Improve documentation formatting Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jeremy Tan <jtanx@outlook.com> Acked-by: David Adam <zanchey@ucc.gu.uwa.edu.au> Merge-request: !5948
| * | | FindIntl: Fix detection of intl built in to C libraryBrad King2021-03-262-39/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c30d06b7e6 (FindIntl: Add imported target, 2020-10-06, v3.20.0-rc1~687^2) we use `check_symbol_exists` to check whether the `intl` library is built in to the C library. On some platforms the tested symbols are provided as macros so the check passes without linking any symbol. Instead, check whether a sample source file both compiles and links. Fixes: #21979
| * | | FindIntl: Improve documentation formattingSibi Siddharthan2021-03-261-17/+38
| | |/ | |/| | | | | | | Backport from commit a9b11a06f5 (FindIntl: Add version support, 2021-02-23).
* | | Merge topic 'correct_arg_parsing' into release-3.20Brad King2021-03-294-5/+15
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 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-264-5/+15
| | | | | | | | | | | | | | | | | | | | | Fixes #21966 Correctly compute the next parse index for `ZeroOrOne` when it is zero, and for OneOrMore.
* | | Merge topic 'ninja-multi-long-custom-command' into release-3.20Brad King2021-03-263-0/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3b864b2583 Ninja Multi-Config: Include configs in long CC scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5941
| * | | Ninja Multi-Config: Include configs in long CC scriptsKyle Edwards2021-03-253-0/+27
|/ / / | | | | | | | | | Fixes: #21973
* | | Merge topic 'doc-custom-output-genex' into release-3.20Brad King2021-03-253-3/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2f59b683d3 Help: Custom OUTPUT and BYPRODUCTS genexes cannot refer to targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5939
| * | | Help: Custom OUTPUT and BYPRODUCTS genexes cannot refer to targetsCraig Scott2021-03-253-3/+11
| | |/ | |/| | | | Relates: #21364
* | | Merge topic 'nsis-branding-trim-position' into release-3.20Brad King2021-03-252-3/+12
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | a6a5256395 CPack: Validate and document NSIS branding text trim positions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5928
| * | CPack: Validate and document NSIS branding text trim positionsCraig Scott2021-03-242-3/+12
| |/
* | Merge branch 'release-3.19' into release-3.20Brad King2021-03-240-0/+0
|\ \
| * \ Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into release-3.19Brad King2021-03-241-4/+4
| |\ \ | | | | | | | | | | | | Merge-request: !5935
* | \ \ Merge topic 'ci-msvc-14.28-16.9' into release-3.20Brad King2021-03-241-4/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 472a11c3d2 Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into ci-msvc-14.28-16.9 3a042bef8e gitlab-ci: Update Windows builds to MSVC 19.28-16.9 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5935
| * | | Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into ci-msvc-14.28-16.9Brad King2021-03-241-4/+4
| |\ \ \ |/ / / / | | | _
| * | gitlab-ci: Update Windows builds to MSVC 19.28-16.9 toolsetBrad King2021-03-241-4/+4
| |/
* | CMake 3.20.0v3.20.0Brad King2021-03-231-1/+1
| |
* | Merge topic 'doc-xcoff-chrpath' into release-3.20Brad King2021-03-231-6/+13
|\ \ | | | | | | | | | | | | | | | | | | 4a9fb82030 Help: CMAKE_NO_BUILTIN_CHRPATH applies to XCOFF too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5925
| * | Help: CMAKE_NO_BUILTIN_CHRPATH applies to XCOFF tooCraig Scott2021-03-221-6/+13
|/ /
* | Merge topic 'schema-typo' into release-3.20Brad King2021-03-191-15/+15
|\ \ | | | | | | | | | | | | | | | | | | bda6446e6f Help: Fix typos in presets schema field descriptions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5922
| * | Help: Fix typos in presets schema field descriptionsAdriaan de Groot2021-03-181-15/+15
| | |
* | | Merge topic 'fix-CMP0118-NEW' into release-3.20Brad King2021-03-1923-102/+66
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 17eb610a31 Help: Document CMP0118 requirement for boolean values 06feb845aa CMP0118: Fix NEW behavior when looking up target sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5921
| * | Help: Document CMP0118 requirement for boolean valuesBrad King2021-03-181-2/+8
| | |
| * | CMP0118: Fix NEW behavior when looking up target sourcesBrad King2021-03-1822-100/+58
|/ / | | | | | | | | | | | | | | | | | | 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 branch 'release-3.19' into release-3.20Brad King2021-03-170-0/+0
|\ \ | |/
| * Merge branch 'backport-3.19-ci-vs-16.8-in-16.9' into release-3.19Brad King2021-03-172-4/+4
| |\ | | | | | | | | | Merge-request: !5918
| * \ Merge branch 'ninja-regenerate-no-recompact' into release-3.19Brad King2021-03-161-2/+3
| |\ \ | | | | | | | | | | | | Merge-request: !5916
| * \ \ Merge branch 'FindPkgConfig-NAMES_PER_DIR' into release-3.19Brad King2021-03-161-1/+4
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !5914
* | \ \ \ 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
generated by cgit v0.12 at 2025-02-03 09:07:12 (GMT)