diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-04 13:05:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-11-04 13:05:39 (GMT) |
| commit | 6f995f3825771ecb29e6a5d4e665f8c9c34ff92e (patch) | |
| tree | 2e7b1cc9f7ca7fc4570db9fb6f0dc7358d06ff0e /Source | |
| parent | 274e3fb7f4eea7ae26ce63efdfbf4851256c097d (diff) | |
| parent | 9ed1d7bee6f36b489fa3bb5e77add26ea6119f61 (diff) | |
| download | CMake-6f995f3825771ecb29e6a5d4e665f8c9c34ff92e.zip CMake-6f995f3825771ecb29e6a5d4e665f8c9c34ff92e.tar.gz CMake-6f995f3825771ecb29e6a5d4e665f8c9c34ff92e.tar.bz2 | |
Merge topic 'msvc-cxx-modules-scanDependencies' into release-3.22
9ed1d7bee6 cmScanDepFormat: Accept P1689r4 files with version 1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6696
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmScanDepFormat.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmScanDepFormat.cxx b/Source/cmScanDepFormat.cxx index 6fcbce5..82a374a 100644 --- a/Source/cmScanDepFormat.cxx +++ b/Source/cmScanDepFormat.cxx @@ -97,7 +97,7 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp, } Json::Value const& version = ppi["version"]; - if (version.asUInt() != 0) { + if (version.asUInt() > 1) { cmSystemTools::Error(cmStrCat("-E cmake_ninja_dyndep failed to parse ", arg_pp, ": version ", version.asString())); return false; |