Skip to content

Commit bd0a7a4

Browse files
czoidoAbrilRBS
andauthored
Sync develop2 with release branch (#4299)
* Conan 2.22.0 docs * Conan 2.22.1 * Merge pull request #4294 from AbrilRBS/ar/fix-hook-link Fix some links that were giving 404 --------- Co-authored-by: Abril Rincón Blanco <5364255+AbrilRBS@users.noreply.github.com>
2 parents 0c59616 + 2738901 commit bd0a7a4

File tree

6 files changed

+51
-8
lines changed

6 files changed

+51
-8
lines changed

changelog.rst

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,51 @@ Changelog
33

44
This page lists the changes made to Conan in each version, with links to each pull request for more details.
55

6+
2.22.1 (30-Oct-2025)
7+
--------------------
8+
9+
- Bugfix: Revert "Error out if components miss requiring direct dependencies in more cases". `#19168 <https://github.com/conan-io/conan/pull/19168>`_
10+
11+
2.22.0 (29-Oct-2025)
12+
--------------------
13+
14+
- Feature: Make the remote name used by ``conan config install-pkg --url=<url>`` public. `#19132 <https://github.com/conan-io/conan/pull/19132>`_ . Docs `here <https://github.com/conan-io/docs/pull/4281>`__
15+
- Feature: Add support for macOS 15.7 and iOS 18.7. `#19130 <https://github.com/conan-io/conan/pull/19130>`_
16+
- Feature: Group arguments in CLI help. `#19126 <https://github.com/conan-io/conan/pull/19126>`_
17+
- Feature: Suggest possible typos for CLI arguments declared as string choices. `#19126 <https://github.com/conan-io/conan/pull/19126>`_
18+
- Feature: Add opt-in conf to control making `.sh` and `.ps1` env `deactivate` functionality into in-memory functions instead of files. `#19105 <https://github.com/conan-io/conan/pull/19105>`_ . Docs `here <https://github.com/conan-io/docs/pull/4286>`__
19+
- Feature: Document ``ExportAPI``. `#19103 <https://github.com/conan-io/conan/pull/19103>`_
20+
- Feature: Enable parallel download of packages by default, by defaulting ``core.download:parallel`` to the available CPU cores. `#19099 <https://github.com/conan-io/conan/pull/19099>`_ . Docs `here <https://github.com/conan-io/docs/pull/4282>`__
21+
- Feature: Support ``conan graph info --package-filter=&`` pattern. `#19080 <https://github.com/conan-io/conan/pull/19080>`_ . Docs `here <https://github.com/conan-io/docs/pull/4283>`__
22+
- Feature: Add new environment variable `CONAN_DEFAULT_BUILD_PROFILE` for default build profile. `#19040 <https://github.com/conan-io/conan/pull/19040>`_ . Docs `here <https://github.com/conan-io/docs/pull/4284>`__
23+
- Feature: Allow nullifying settings from profiles and command line. `#19035 <https://github.com/conan-io/conan/pull/19035>`_ . Docs `here <https://github.com/conan-io/docs/pull/4285>`__
24+
- Feature: Support compatibility plugin removal of nullable settings. `#19031 <https://github.com/conan-io/conan/pull/19031>`_ . Docs `here <https://github.com/conan-io/docs/pull/4278>`__
25+
- Feature: New ``tools.gnu:disable_flags`` configuration to allow disabling the injection of some build system flags. `#19014 <https://github.com/conan-io/conan/pull/19014>`_
26+
- Feature: Expose `recipe` in the `ConanFileInterface` for information purpose only. `#18995 <https://github.com/conan-io/conan/pull/18995>`_ . Docs `here <https://github.com/conan-io/docs/pull/4264>`__
27+
- Feature: New ``CMakeConfigDeps`` properties to inject extra dependencies and targets. `#18316 <https://github.com/conan-io/conan/pull/18316>`_
28+
- Fix: Better error message for ``CMakeConfigDeps`` when the package_type or component type is not defined for something with ``.location`` defined. `#19096 <https://github.com/conan-io/conan/pull/19096>`_
29+
- Fix: Change order of ``build_modules`` inclusion in ``CMakeConfigDeps`` so it happens after legacy-vars, to support some ConanCenter recipes abusing those variables. `#19094 <https://github.com/conan-io/conan/pull/19094>`_
30+
- Fix: Reintroduce `settings.yml` access to `config` Sub-API. `#19078 <https://github.com/conan-io/conan/pull/19078>`_
31+
- Fix: Raise an error if ``conan list * --lru=xx``, recommending the ``#<rev-pattern>`` argument. `#19077 <https://github.com/conan-io/conan/pull/19077>`_
32+
- Fix: Sanitize XcodeDeps file and variable names to use only valid xcconfig characters. `#19075 <https://github.com/conan-io/conan/pull/19075>`_
33+
- Fix: Explicitly set ``allow_empty=True`` in ``glob()`` function in ``BazelDeps`` (Bazel 8.x compatible). `#19068 <https://github.com/conan-io/conan/pull/19068>`_
34+
- Fix: Fix ``CMakeConfigDeps`` when a regular library ``requires()`` an application, using components. `#19052 <https://github.com/conan-io/conan/pull/19052>`_
35+
- Fix: Add missing final newline when saving lockfiles to disk. `#19043 <https://github.com/conan-io/conan/pull/19043>`_
36+
- Fix: Warn when adding requirement to version range with pinned revision, it has no effect. `#19041 <https://github.com/conan-io/conan/pull/19041>`_ . Docs `here <https://github.com/conan-io/docs/pull/4280>`__
37+
- Fix: Fix ``CMakeConfigDeps`` escaping. `#19034 <https://github.com/conan-io/conan/pull/19034>`_
38+
- Fix: Improved Python virtual environment creation in ``PipEnv`` by using the system-installed interpreter or a user-defined one via ``tools.system.pipenv:python_interpreter``. `#19030 <https://github.com/conan-io/conan/pull/19030>`_ . Docs `here <https://github.com/conan-io/docs/pull/4291>`__
39+
- Fix: Add VS2026 CMake generator mapping. `#19024 <https://github.com/conan-io/conan/pull/19024>`_
40+
- Fix: Avoid referencing xcconfig from skipped dependencies required in components in XcodeDeps. `#19023 <https://github.com/conan-io/conan/pull/19023>`_
41+
- Fix: Add ``execution["jobs"]`` to the generated CMake ``testPresets`` with same logic and value as ``buildPresets``. `#19021 <https://github.com/conan-io/conan/pull/19021>`_
42+
- Fix: Improve the error message when a workspace ``super-install`` defines intermediate packages in the cache depending on workspace packages. `#19013 <https://github.com/conan-io/conan/pull/19013>`_
43+
- Fix: Improve support for huge diffs in `conan report diff` HTML output. `#19012 <https://github.com/conan-io/conan/pull/19012>`_ . Docs `here <https://github.com/conan-io/docs/pull/4279>`__
44+
- Bugfix: ``MSBuildToolchain`` explicitly adds the specific toolset .props file when ``compiler.update`` is defined, otherwise, activating ``vcvars`` is not enough. `#19137 <https://github.com/conan-io/conan/pull/19137>`_
45+
- Bugfix: Fixes an issue where the Apt packages for the build arch would be reported missing, in cross-compiling scenarios, even though they are installed. `#19074 <https://github.com/conan-io/conan/pull/19074>`_
46+
- Bugfix: Solve unexpected conflict when pinning a ``recipe-revision`` directly in a conanfile that is not the latest, and having other dependencies resolving first to the latest recipe revision. `#19038 <https://github.com/conan-io/conan/pull/19038>`_
47+
- Bugfix: Fix ``<host_version>`` resolution in certain transitive cases. `#18947 <https://github.com/conan-io/conan/pull/18947>`_
48+
- Bugfix: Fix orphan nodes being created when expanding the dependency graph for some cases. `#18947 <https://github.com/conan-io/conan/pull/18947>`_
49+
- Bugfix: Error out if components miss requiring direct dependencies in more cases. `#18830 <https://github.com/conan-io/conan/pull/18830>`_
50+
651
2.21.0 (29-Sept-2025)
752
---------------------
853

conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666

6767

6868
# The short X.Y version.
69-
version = "2.21"
69+
version = "2.22"
7070
# The full version, including alpha/beta/rc tags.
71-
release = u'2.21.0'
71+
release = u'2.22.1'
7272

7373
dir_path = os.path.dirname(os.path.realpath(__file__))
7474
if not os.path.exists(os.path.join(dir_path, "versions.json")):

examples/dev_flow/debug/debugging_visual.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ to get information of a DLL, in this case the path where its associated PDB is l
105105
in the package to locate its PDB to copy it to the package folder.
106106

107107
For more information on how PDBs work with Visual and how we used it to create the hook can be found in the
108-
`hook readme <https://github.com/conan-io/conan-extensions/blob/main/hooks/README.md>`_.
108+
`hook readme <https://github.com/conan-io/conan-extensions/blob/main/extensions/hooks/README.md>`_.
109109

110110
Debugging without build files
111111
-----------------------------
@@ -178,5 +178,3 @@ Starting the debugger again will allow to step into the code of the dependency a
178178

179179
Any modification to the source files will not allow debugging over them, as Visual Studio does a checksum check, so
180180
they need to be the exact same files as when the libraries were compiled.
181-
182-

examples/tools/autotools/build_project_autotools_toolchain.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Build a simple Autotools project with Conan dependencies
1111

1212

1313
In this example, we are going to create a string formatter application
14-
that uses one of the most popular C++ libraries: `fmt <https://fmt.dev/latest/index.html/>`_.
14+
that uses one of the most popular C++ libraries: `fmt <https://fmt.dev/latest>`_.
1515

1616
We'll use `Autotools <https://www.gnu.org/software/automake/manual/html_node/Autotools-Introduction.html>`_ as build system and `pkg-config <https://www.freedesktop.org/wiki/Software/pkg-config/>`_ as a helper tool in this case, so you should get them installed
1717
on Linux and Mac before going forward with this example.

examples/tools/google/bazeltoolchain/build_simple_bazel_7x_project.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Build a simple Bazel 7.x project using Conan
88
This example is Bazel >= 7.1 compatible.
99

1010
In this example, we are going to create a Hello World program
11-
that uses one of the most popular C++ libraries: `fmt <https://fmt.dev/latest/index.html/>`_.
11+
that uses one of the most popular C++ libraries: `fmt <https://fmt.dev/latest>`_.
1212

1313
.. note::
1414

examples/tools/google/bazeltoolchain/build_simple_bazel_project.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Build a simple Bazel project using Conan
88
This example is Bazel 6.x compatible.
99

1010
In this example, we are going to create a Hello World program
11-
that uses one of the most popular C++ libraries: `fmt <https://fmt.dev/latest/index.html/>`_.
11+
that uses one of the most popular C++ libraries: `fmt <https://fmt.dev/latest>`_.
1212

1313
.. note::
1414

0 commit comments

Comments
 (0)