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 /Help/manual | |
| 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 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-presets.7.rst | 21 | ||||
| -rw-r--r-- | Help/manual/cmake.1.rst | 13 |
2 files changed, 16 insertions, 18 deletions
diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst index 31bd9c0..346e821 100644 --- a/Help/manual/cmake-presets.7.rst +++ b/Help/manual/cmake-presets.7.rst @@ -498,17 +498,16 @@ that may contain the following fields: .. note:: - If this setting is not specified in a preset, CMake will instead - use the setting specified by the ``--resolve-package-references`` - command line parameter. If the command line parameter is not - provided either, an environment-specific cache variable will be - evaluated to decide, if package restoration should be performed. - - When using the Visual Studio generator, package references are - defined using the :prop_tgt:`VS_PACKAGE_REFERENCES` property. - Package references are restored using NuGet. It can be disabled - by setting the ``CMAKE_VS_NUGET_PACKAGE_RESTORE`` variable to - ``OFF``. This can also be done from within a configure preset. + The command line parameter ``--resolve-package-references`` will take + priority over this setting. If the command line parameter is not provided + and this setting is not specified, an environment-specific cache variable + will be evaluated to decide, if package restoration should be performed. + + When using the Visual Studio generator, package references are defined + using the :prop_tgt:`VS_PACKAGE_REFERENCES` property. Package references + are restored using NuGet. It can be disabled by setting the + ``CMAKE_VS_NUGET_PACKAGE_RESTORE`` variable to ``OFF``. This can also be + done from within a configure preset. ``verbose`` diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 7eb7dec..c68e7a9 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -472,16 +472,15 @@ following options: target. When set to ``only``, the packages will be restored, but no build will be performed. When set to ``off``, no packages will be restored. - If the target does not define any package references, this option does - nothing. + If the target does not define any package references, this option does nothing. This setting can be specified in a build preset (using - ``resolvePackageReferences``). In this case, the command line option will - be ignored. + ``resolvePackageReferences``). The preset setting will be ignored, if this + command line option is specified. - If the no command line parameter or preset option is not provided, an - environment-specific cache variable will be evaluated to decide, if package - restoration should be performed. + If no command line parameter or preset option are provided, an environment- + specific cache variable will be evaluated to decide, if package restoration + should be performed. When using the Visual Studio generator, package references are defined using the :prop_tgt:`VS_PACKAGE_REFERENCES` property. Package references |