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:40 (GMT) |
| commit | 10bebbf7a83aa784a73f94e4e17819d88084dc57 (patch) | |
| tree | 250232446de97c6d95bdbc03fc6738d052c3c1c7 | |
| parent | e83f9c5316d1bf43cf12dfb315ce54a7f510a294 (diff) | |
| parent | 9ed1d7bee6f36b489fa3bb5e77add26ea6119f61 (diff) | |
| download | CMake-10bebbf7a83aa784a73f94e4e17819d88084dc57.zip CMake-10bebbf7a83aa784a73f94e4e17819d88084dc57.tar.gz CMake-10bebbf7a83aa784a73f94e4e17819d88084dc57.tar.bz2 | |
Merge topic 'msvc-cxx-modules-scanDependencies'
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
| -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; |