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
This commit is contained in:
Brad King
2021-11-04 13:05:09 +00:00
committed by Kitware Robot

View File

@@ -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;