Skip to content

Commit 22f6941

Browse files
authored
Clarify presets and toolchain files (#3777)
* clarify cmaketoolchain files * intro to presets
1 parent ec22cf9 commit 22f6941

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

tutorial/consuming_packages/build_simple_cmake_project.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,16 @@ Now we are ready to build and run our **compressor** app:
264264
ZLIB VERSION: 1.2.11
265265
266266
267+
Note that ``CMakeToolchain`` might generate CMake **presets** files, that allows users with a modern CMake (``>=3.23``) to
268+
use them with ``cmake --preset`` instead of passing the toolchain file argument.
269+
See :ref:`Building with CMake presets<examples-tools-cmake-toolchain-build-project-presets>`
270+
271+
267272
.. _consuming_packages_read_more:
268273

269274
.. seealso::
270275

276+
- :ref:`Building with CMake presets<examples-tools-cmake-toolchain-build-project-presets>`
271277
- :ref:`Getting started with Autotools<examples_tools_autotools_autotools_toolchain_build_project_autotools_toolchain>`
272278
- :ref:`Getting started with Meson<examples_tools_meson_toolchain_build_simple_meson_project>`
273279
- :ref:`Getting started with Bazel<examples_tools_bazel_toolchain_build_simple_bazel_project>`

tutorial/consuming_packages/different_configurations.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ command using the ``--profile=debug`` argument instead of the
121121
``--settings=build_type=Debug`` argument.
122122

123123
This :command:`conan install` command will check if we already have the required libraries in the local cache
124-
(Zlib) for Debug configuration and obtain them if not. It will also set the build
125-
configuration in the ``conan_toolchain.cmake`` toolchain that the CMakeToolchain generator
124+
(Zlib) for Debug configuration and obtain them if not. It will also update the build
125+
configuration in the ``conan_toolchain.cmake`` and ``CMakePresets.json`` files that the ``CMakeToolchain`` generator
126126
creates so that when we build the application it's built in *Debug* configuration. Now
127127
build your project as you did in the previous examples and check in the output how it was
128128
built in *Debug* configuration:

0 commit comments

Comments
 (0)