Skip to content

Commit 36f8acd

Browse files
czoidoczoido
committed
Merge branch 'release/2.0' into develop2
2 parents 40fd000 + 6527af7 commit 36f8acd

27 files changed

+64
-39
lines changed

‎.ci/test.jenkins

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
node('Linux') {
44

55
boolean publishDocs = env.BRANCH_NAME.startsWith("release/2.")
6-
def targetBranch = env.CHANGE_BRANCH ? env.CHANGE_BRANCH : env.BRANCH_NAME
6+
def targetBranch = env.CHANGE_TARGET ? env.CHANGE_TARGET : env.BRANCH_NAME
77

88
// We also have to clone conan sources for the sphinx autodoc extension
99
def conanBranch = targetBranch.startsWith("release/2.") ? targetBranch : 'develop2'
1010
def conan_repo_url = 'https://github.com/conan-io/conan.git'
1111

1212
echo "Docs target branch: ${targetBranch}"
1313
echo "Conan target branch: ${conanBranch}"
14+
echo "env.BRANCH_NAME: ${env.BRANCH_NAME}"
15+
echo "env.CHANGE_BRANCH: ${env.CHANGE_BRANCH}"
16+
echo "env.CHANGE_TARGET: ${env.CHANGE_TARGET}"
1417

1518
stage('Clone sources') {
1619
checkout scm

‎common/experimental_warning.rst renamed to ‎common/experimental_warning.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
:orphan:
2-
31
.. warning::
42
This feature is experimental and subject to breaking changes.

‎examples/tools/cmake/cmake_toolchain/build_project_cmake_presets.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The ``CMakePresets.json`` contain information about the ``conan_toolchain.cmake`
4343
and even the ``binaryDir`` set with the output directory.
4444

4545

46-
.. include:: ../../../../tutorial/cmake_presets_note.rst
46+
.. include:: ../../../../tutorial/cmake_presets_note.inc
4747

4848

4949
If you are using a multi-configuration generator:

‎examples/tools/cmake/cmake_toolchain/extend_own_cmake_presets.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CMakeToolchain: Extending your CMakePresets with Conan generated ones
66
In this example we are going to see how to extend your own CMakePresets to include Conan
77
generated ones.
88

9-
.. include:: ../../../../tutorial/cmake_presets_note.rst
9+
.. include:: ../../../../tutorial/cmake_presets_note.inc
1010

1111
Please, first of all, clone the sources to recreate this project. You can find them in the
1212
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:

‎knowledge/faq.rst

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,38 @@ overcome this error:
6161
<https://github.com/conan-io/conan-center-index>`_
6262

6363

64+
65+
.. _error_invalid_setting:
66+
67+
ERROR: Invalid setting
68+
^^^^^^^^^^^^^^^^^^^^^^
69+
70+
It might happen sometimes, when you specify a setting not present in the defaults
71+
that you receive a message like this:
72+
73+
.. code-block:: bash
74+
75+
$ conan install . -s compiler.version=4.19 ...
76+
77+
ERROR: Invalid setting '4.19' is not a valid 'settings.compiler.version' value.
78+
Possible values are ['4.4', '4.5', '4.6', '4.7', '4.8', '4.9', '5.1', '5.2', '5.3', '5.4', '6.1', '6.2']
79+
80+
81+
This doesn't mean that such compiler version is not supported by Conan, it is just that it is not present in the actual
82+
defaults settings. You can find in your user home folder ``~/.conan2/settings.yml`` a settings file that you
83+
can modify, edit, add any setting or any value, with any nesting if necessary. See :ref:`reference_config_files_settings_yml` to learn
84+
how you can customize your settings to model your binaries at your will.
85+
86+
As long as your team or users have the same settings (``settings.yml`` and ``settings_user.yml`` an be easily shared with the
87+
``conan config install`` command), everything will work. The *settings.yml* file is just a
88+
mechanism so users agree on a common spelling for typical settings. Also, if you think that some settings would
89+
be useful for many other conan users, please submit it as an issue or a pull request, so it is included in future
90+
releases.
91+
92+
It is possible that some built-in helper or integrations, like ``CMake`` or ``CMakeToolchain`` will not understand the new added settings,
93+
don't use them or even fail if you added some new unexpected value to existing settings.
94+
Such helpers as ``CMake`` are simple utilities to translate from conan settings to the respective
95+
build system syntax and command line arguments, so they can be extended or replaced with your own
96+
one that would handle your own private settings.
97+
6498
.. _`Cpplang Slack`: https://cppalliance.org/slack/

‎reference/commands/inspect.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
conan inspect
44
=============
55

6-
.. include:: ../../common/experimental_warning.rst
6+
.. include:: ../../common/experimental_warning.inc
77

88
.. code-block:: text
99

‎reference/config_files/profiles.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ List of ``tool_requires`` required by your recipe or its dependencies:
217217
[system_tools]
218218
+++++++++++++++
219219

220-
.. include:: ../../common/experimental_warning.rst
220+
.. include:: ../../common/experimental_warning.inc
221221

222222
This section is similar to the previous one, **[tool_requires]**, but it's intended to list only the tool requires
223223
that are already in your own system and you don't want Conan to search for, neither remotely nor locally.

‎reference/config_files/settings.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ to the ``update`` subsetting in ``settings.yml``.
208208
intel-cc
209209
++++++++
210210

211-
.. include:: ../../common/experimental_warning.rst
211+
.. include:: ../../common/experimental_warning.inc
212212

213213
This compiler is aimed to handle the new Intel oneAPI DPC++/C++/Classic compilers. Instead of having *n* different compilers,
214214
you have 3 different **modes** of working:

‎reference/extensions/python_api/ConanAPI.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Conan API Reference
44
===================
55

6-
.. include:: ../../../common/experimental_warning.rst
6+
.. include:: ../../../common/experimental_warning.inc
77

88
.. currentmodule:: conan.api.conan_api
99

‎reference/extensions/python_api/ConfigAPI.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Config API
22
==========
33

4-
.. include:: ../../../common/experimental_warning.rst
4+
.. include:: ../../../common/experimental_warning.inc
55

66
.. currentmodule:: conan.api.subapi.config
77

0 commit comments

Comments
 (0)