summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ifw-depends-name-version-parsing'Brad King2021-03-303-33/+95
|\ | | | | | | | | | | | | | | a43783a08d CPackIFW: Fix parsing of name and version in component DEPENDS f536e6f3fb CPackIFW: Remove redundant variable assignment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5929
| * CPackIFW: Fix parsing of name and version in component DEPENDSCraig Scott2021-03-263-32/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DEPENDS or DEPENDENCIES arguments in a call to cpack_ifw_configure_component() or cpack_ifw_configure_component_group() specify a name and optionally a version constraint as a single string. QtIFW also allows a colon (requires QtIFW 3.1 or later) or a hyphen to separate the name and version. The version may optionally contain a leading operator, with = being assumed when no operator is present. The previous code was not handling : as a separator at all and was erroneously dropping the version part when no operator was given. Fix both of those non-conforming behaviors and also warn if trying to use a hyphen in a name with a QtIFW version that isn't recent enough to support it. Fixes: #21697
| * CPackIFW: Remove redundant variable assignmentCraig Scott2021-03-241-1/+1
| | | | | | This was showing up in cppcheck results.
* | Merge topic 'multiple-L-labels'Brad King2021-03-3014-82/+222
|\ \ | | | | | | | | | | | | | | | | | | | | | 44ad3f0b7f ctest: Support multiple -L and -LE options to mean "AND" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Lars Bilke <larsbilke83@googlemail.com> Merge-request: !5329
| * | ctest: Support multiple -L and -LE options to mean "AND"Adriaan de Groot2021-03-2814-82/+222
| | | | | | | | | | | | Fixes: #21087
* | | Merge branch 'release-3.20'Brad King2021-03-300-0/+0
|\ \ \
| * \ \ 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
* | \ \ \ Merge topic 'ninja-automoc-cycle'Brad 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 branch 'release-3.20'Brad King2021-03-300-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | \ \ \ \ Merge topic 'GNUInstallDirs-doc'Brad 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 branch 'release-3.20'Brad King2021-03-300-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | | | | | Merge topic 'nmc-cc-no-output'Brad 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.
* | | | | CMake Nightly Date StampKitware Robot2021-03-301-1/+1
| | | | |
* | | | | Merge topic 'SWIG'Brad King2021-03-2913-3/+98
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d8e3a1e77 UseSWIG: Use standard library name conventions for csharp language Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5949
| * | | | | UseSWIG: Use standard library name conventions for csharp languageMarc Chevrier2021-03-2613-3/+98
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21542
* | | | | | Merge topic 'FindDoxygen-clarify-cmake-variable-naming'Brad King2021-03-291-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 739446a9a1 FindDoxygen: clarify the CMake variable naming scheme Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Mateusz Mania <kajtkowo@gmail.com> Merge-request: !5943
| * | | | | | FindDoxygen: clarify the CMake variable naming schemeBen Boeckel2021-03-251-1/+2
| | | | | | |
* | | | | | | Merge branch 'release-3.20'Brad King2021-03-290-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | 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
* | \ \ \ \ \ \ Merge topic 'commands-file-permissions'Brad 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 branch 'release-3.20'Brad King2021-03-290-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
* | \ \ \ \ \ \ \ Merge topic 'FindIntl-builtin'Brad King2021-03-292-47/+71
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0850160254 Merge branch 'backport-FindIntl-builtin' into FindIntl-builtin 8e342a6637 FindIntl: Fix detection of intl built in to C library f56c1571d2 Merge branch 'backport-FindIntl-builtin' into FindIntl-builtin 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
| * \ \ \ \ \ \ \ \ Merge branch 'backport-FindIntl-builtin' into FindIntl-builtinBrad King2021-03-261-0/+14
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | 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: Fix detection of intl built in to C libraryBrad King2021-03-261-44/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Merge branch 'backport-FindIntl-builtin' into FindIntl-builtinBrad King2021-03-261-3/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | FindIntl: Improve documentation formattingSibi Siddharthan2021-03-261-17/+38
| | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Backport from commit a9b11a06f5 (FindIntl: Add version support, 2021-02-23).
* | | | | | | | | Merge branch 'release-3.20'Brad King2021-03-290-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | 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
* | | | | | | | | Merge topic 'correct_arg_parsing'Brad 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.
* | | | | | | | | CMake Nightly Date StampKitware Robot2021-03-291-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2021-03-281-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2021-03-271-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge topic 'project-is-top-level'Brad King2021-03-2614-5/+106
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96a7040107 project: Define variables indicating whether project is top level 3706e9c97c Help: Convert project() directory variables to a definition list Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Hirsch <michael@scivision.dev> Merge-request: !5938
| * | | | | | | project: Define variables indicating whether project is top levelfriendlyanon2021-03-2614-0/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define `PROJECT_IS_TOP_LEVEL` and `<PROJECT-NAME>_IS_TOP_LEVEL`. The latter is a STATIC cache entry just like other `<PROJECT-NAME>_*` variables so that it is globally scoped. Issue: #20310 Fixes: #21961
| * | | | | | | Help: Convert project() directory variables to a definition listBrad King2021-03-261-5/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'windows-long-path'Brad King2021-03-261-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2fe39dc306 cmake: Fix loading CMake sources from long paths on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5940
generated by cgit v0.12 at 2025-09-06 01:23:19 (GMT)