diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-16 14:40:57 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-16 09:41:03 -0500 |
| commit | 731bdec8b9a752772e35ca9563cfcd91d53f4e49 (patch) | |
| tree | b2f795e2e14640a6f98ccec777268e0e26b4bc8e /Source/cmGlobalVisualStudio10Generator.cxx | |
| parent | 1c62bf6a6d415e7515463b406160029e31a10ead (diff) | |
| parent | d92469e57210d6b4e9a2733d3477ae44a6cf9735 (diff) | |
| download | cmake-731bdec8b9a752772e35ca9563cfcd91d53f4e49.tar.gz | |
Merge topic 'vs-package-restore-docs'
d92469e572 Help: Clarify how package resolve mode is intended to be used
f320a31087 cmake --build: prioritize --resolve-package-references over preset
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6984
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 3301e8cc71..28d62959c5 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -1222,7 +1222,7 @@ cmGlobalVisualStudio10Generator::GenerateBuildCommand( "Studio 2017 and later. You have to manually restore the " "packages using NuGet before building the project."); restorePackages = false; - } else if (restoreMode == PackageResolveMode::FromCacheVariable) { + } else if (restoreMode == PackageResolveMode::Default) { // Decide if a restore is performed, based on a cache variable. if (cmValue cached = this->CMakeInstance->GetState()->GetCacheEntryValue( |