diff options
| author | Carsten Rudolph <18394207+crud89@users.noreply.github.com> | 2022-02-15 09:25:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-02-15 15:20:02 (GMT) |
| commit | f320a31087c4efc07e7d10b621ec45dd0350c83a (patch) | |
| tree | 19e38afc5f7b43c2bd54575c2b13db8996a719e4 /Source/cmake.cxx | |
| parent | e5a5f3b76fd89a8e98c981012714f94a1d984ad8 (diff) | |
| download | CMake-f320a31087c4efc07e7d10b621ec45dd0350c83a.zip CMake-f320a31087c4efc07e7d10b621ec45dd0350c83a.tar.gz CMake-f320a31087c4efc07e7d10b621ec45dd0350c83a.tar.bz2 | |
cmake --build: prioritize --resolve-package-references over preset
Fixes: #23224
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index ef4e37b..e1ba12c 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -3356,7 +3356,8 @@ int cmake::Build(int jobs, std::string dir, std::vector<std::string> targets, buildOptions.Clean = *expandedPreset->CleanFirst; } - if (expandedPreset->ResolvePackageReferences) { + if (buildOptions.ResolveMode == PackageResolveMode::Default && + expandedPreset->ResolvePackageReferences) { buildOptions.ResolveMode = *expandedPreset->ResolvePackageReferences; } |