summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2021-04-021-1/+1
|
* Merge topic 'cmake-presets-condition-regex'Brad King2021-04-013-0/+50
|\ | | | | | | | | | | | | 5ac8b923f5 CMakePresets.json: Add matches condition Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5963
| * CMakePresets.json: Add matches conditionKyle Edwards2021-03-313-0/+50
| |
* | Merge topic 'genex-HOST_LINK-in-try_compile'Brad 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'Brad 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 '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
| * \ \ 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
* | \ \ \ Merge topic 'make-fix-deps-paths'Brad 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
* | | | | CMake Nightly Date StampKitware Robot2021-04-011-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'update-kwsys'Brad King2021-03-312-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25ccb2c7c3 Merge branch 'upstream-KWSys' into update-kwsys d0b9ffb630 KWSys 2021-03-30 (db93a594) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5960
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2021-03-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2021-03-30 (db93a594)
* | | | | CMake Nightly Date StampKitware Robot2021-03-311-1/+1
|/ / / /
* | | | Merge topic 'ifw-depends-name-version-parsing'Brad King2021-03-301-33/+78
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-32/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-308-80/+162
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-288-80/+162
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21087
* | | | | | Merge topic 'ninja-automoc-cycle'Brad 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 '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
| * \ \ \ \ 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
* | \ \ \ \ \ Merge topic 'nmc-cc-no-output'Brad 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
* | | | | | CMake Nightly Date StampKitware Robot2021-03-301-1/+1
| | | | | |
* | | | | | Merge topic 'SWIG'Brad King2021-03-291-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21542
* | | | | | | Merge topic 'commands-file-permissions'Brad 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'Brad 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.
* | | | | | 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-261-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | 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
| * | | | | | cmake: Fix loading CMake sources from long paths on WindowsMatt Jaeger2021-03-251-1/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | Pass a Windows extended path to the lexer so it can open long paths.
* | | | | | Merge topic 'ninja-multi-long-custom-command'Brad King2021-03-261-0/+6
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | | | | | | | | | | | | 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-251-0/+6
| | | | | | | | | | | | | | | | | | | | Fixes: #21973
* | | | | CMake Nightly Date StampKitware Robot2021-03-261-1/+1
| |/ / / |/| | |
* | | | Merge topic 'nsis-branding-trim-position'Brad King2021-03-251-3/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f226a1678f Merge branch 'master' into nsis-branding-trim-position a6a5256395 CPack: Validate and document NSIS branding text trim positions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5928
| * \ \ \ Merge branch 'master' into nsis-branding-trim-positionCraig Scott2021-03-2469-1380/+2856
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| * | | 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
| | |
* | | CMake Nightly Date StampKitware Robot2021-03-251-1/+1
| |/ |/|
* | CMake Nightly Date StampKitware Robot2021-03-241-1/+1
| |
* | Merge topic 'vs-custom-flag-table'Brad King2021-03-232-0/+38
|\ \ | | | | | | | | | | | | | | | | | | | | | 608ef8a6fc VS: Add a mostly-undocumented hook to load custom JSON flag tables 8dd8d63665 Tests: Add RunCMake hook to describe test variants Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5895