diff --git a/2.1/404.html b/2.1/404.html index e86e81e9fbe..0cc479a835b 100644 --- a/2.1/404.html +++ b/2.1/404.html @@ -119,7 +119,7 @@

Page Not Found

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/Page Not Found.html b/2.1/Page Not Found.html index cc3b043c4fd..c8bf76988f3 100644 --- a/2.1/Page Not Found.html +++ b/2.1/Page Not Found.html @@ -112,7 +112,7 @@

Page not found

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/_sources/examples/tools/cmake/cmake.rst.txt b/2.1/_sources/examples/tools/cmake/cmake.rst.txt index d63d5ec1859..86261e04e90 100644 --- a/2.1/_sources/examples/tools/cmake/cmake.rst.txt +++ b/2.1/_sources/examples/tools/cmake/cmake.rst.txt @@ -11,4 +11,5 @@ tools.cmake cmake_toolchain/build_project_cmake_presets cmake_toolchain/extend_own_cmake_presets - cmake_toolchain/inject_cmake_variables \ No newline at end of file + cmake_toolchain/inject_cmake_variables + cmake_toolchain/use_package_config_cmake \ No newline at end of file diff --git a/2.1/_sources/examples/tools/cmake/cmake_toolchain/use_package_config_cmake.rst.txt b/2.1/_sources/examples/tools/cmake/cmake_toolchain/use_package_config_cmake.rst.txt new file mode 100644 index 00000000000..7e04fe31ef2 --- /dev/null +++ b/2.1/_sources/examples/tools/cmake/cmake_toolchain/use_package_config_cmake.rst.txt @@ -0,0 +1,140 @@ +.. _examples-tools-cmake-toolchain-use-package-config-cmake: + +CMakeToolchain: Using xxx-config.cmake files inside packages +============================================================ + +Conan relies in the general case in the ``package_info()`` abstraction to allow packages built with any build system +to be usable from any other package built with any other build system. In the CMake case, Conan relies on the +``CMakeDeps`` generator to generate ``xxxx-config.cmake`` files for every dependency, even if those dependencies +didn't generate one or aren't built with CMake at all. + +ConanCenter users this abstraction, not packaging the ``xxx-config.cmake`` files, and using the information in ``package_info()``. +This is very important to provide as build-system agnostic as possible packages and be fair with different build systems, +vendors and users. For example, there are many Conan users happily using native MSBuild (VS) projects without any CMake at all. +If ConanCenter packages were only built using the in-package ``config.cmake`` files, this wouldn't be possible. + +But the fact that ConanCenter does that, doesn't mean that this is not possible or mandatory. It is perfectly possible +to use the in-packages ``xxx-config.cmake`` files, dropping the usage of ``CMakeDeps`` generator. + + +You can find the sources to recreate this example in the `examples2 repository +`_ in GitHub: + +.. code-block:: bash + + $ git clone https://github.com/conan-io/examples2.git + $ cd examples2/examples/tools/cmake/pkg_config_files + + +If we have a look to the ``conanfile.py``: + +.. code-block:: python + + class pkgRecipe(ConanFile): + name = "pkg" + version = "0.1" + ... + + def package_info(self): + # No information provided, only the in-package .cmake is used here + # Other build systems or CMake via CMakeDeps will fail + self.cpp_info.builddirs = ["pkg/cmake"] + self.cpp_info.set_property("cmake_find_mode", "none") + + +This is a very typical recipe, the main difference is the ``package_info()`` method. Three important things to notice: + +- It doesn't define fields like ``self.cpp_info.libs = ["mypkg"]``. Conan will not be propagating this information to + the consumer, the only place this information will be is inside the in-package ``xxx-config.cmake`` file +- Just in case there are some users still instantiating ``CMakeDeps``, it is disabling the client side generation of the + ``xxx-config.cmake`` file with ``set_property("cmake_find_mode", "none")`` +- It is defining that it will contain the build scripts (like the ``xxx-config.cmake`` package) inside that folder, to + be located by consumers. + +So the responsibility of defining the package details has been transferred to the ``CMakeLists.txt`` that contains: + +.. code-block:: cmake + + add_library(mylib src/pkg.cpp) # Use a different name than the package, to make sure + + set_target_properties(mylib PROPERTIES PUBLIC_HEADER "include/pkg.h") + target_include_directories(mylib PUBLIC + $ + $ + ) + + # Use non default mypkgConfig name + install(TARGETS mylib EXPORT mypkgConfig) + export(TARGETS mylib + NAMESPACE mypkg:: # to simulate a different name and see it works + FILE "${CMAKE_CURRENT_BINARY_DIR}/mypkgConfig.cmake" + ) + install(EXPORT mypkgConfig + DESTINATION "${CMAKE_INSTALL_PREFIX}/pkg/cmake" + NAMESPACE mypkg:: + ) + +With that information, when ``conan create`` is executed: + +- The ``build()`` method will build the package +- The ``package()`` method will call ``cmake install``, which will create the ``mypkgConfig.cmake`` file +- It will be created in the package folder ``pkg/cmake/mypkgConfig.cmake`` file +- It will contain enough information for the headers, and it will create a ``mypkg::mylib`` target. + +Note that the details of the config filename, the namespace and the target are also not known by Conan, +so this is also something that the consumer build scripts should know. + + +This is enough to have a package with an internal ``mypkgConfig.cmake`` file that can be used by consumers. +In this example code, the consumer is just the ``test_package/conanfile.py``, but exactly the same wouldn +apply to any arbitrary consumer. + +The consumer ``conanfile.py`` doesn't need to use ``CMakeDeps`` at all, only ``generators = "CMakeToolchain"``. +Note that the ``CMakeToolchain`` generator is still necessary, because the ``mypkgConfig.cmake`` needs to +be found inside the Conan cache. The ``CMakeToolchain`` generated ``conan_toolchain.cmake`` file contains +these paths defined. + +The consumer ``CMakeLists.txt`` would be standard: + +.. code-block:: cmake + + find_package(mypkg CONFIG REQUIRED) + + add_executable(example src/example.cpp) + target_link_libraries(example mypkg::mylib) + + +You can verify it works with: + +.. code-block:: bash + + $ conan create . + + ======== Testing the package: Executing test ======== + pkg/0.1 (test package): Running test() + pkg/0.1 (test package): RUN: Release\example + pkg/0.1: Hello World Release! + pkg/0.1: _M_X64 defined + pkg/0.1: MSVC runtime: MultiThreadedDLL + pkg/0.1: _MSC_VER1939 + pkg/0.1: _MSVC_LANG201402 + pkg/0.1: __cplusplus199711 + pkg/0.1 test_package + + +Important considerations +------------------------ + +The presented approach has one limitation, it doesn't work for multi-configuration IDEs. +Implementing this approach won't allow developers to directly switch from IDEs like Visual Studio from Release to Debug +and viceversa, and it will require a ``conan install`` to change. It is not an issue at all for single-config setups, +but for VS developers it can be a bit inconvenient. The team is working on the VS plugin that might help to mitigate this. +The reason is a CMake limitation, ``find_package()`` can only find one configuration, and with ``CMakeDeps`` being dropped +here, there is nothing that Conan can do to avoid this limitation. + +It is important to know that it is also the package author and the package ``CMakeLists.txt`` responsibility to correctly +manage transitivity to other dependencies, and this is not trivial in some cases. There are risks that if not done +correctly the in-package ``xxx-config.cmake`` file can locate its transitive dependencies elsewhere, like in the system, +but not in the transtive Conan package dependencies. + +Finally, recall that these packages won't be usable by other build systems rather than CMake. diff --git a/2.1/changelog.html b/2.1/changelog.html index 6f19a075731..ba6627c4f18 100644 --- a/2.1/changelog.html +++ b/2.1/changelog.html @@ -826,7 +826,7 @@

2.0.0-beta1 (20-Jun-2022)

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/conan.pdf b/2.1/conan.pdf index 17c3b01ee4a..d2ff5440542 100644 Binary files a/2.1/conan.pdf and b/2.1/conan.pdf differ diff --git a/2.1/devops.html b/2.1/devops.html index 11fdbc44a36..d40e93ad36d 100644 --- a/2.1/devops.html +++ b/2.1/devops.html @@ -139,7 +139,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/devops/backup_sources/repositories/artifactory/creating_backup_sources_repo.html b/2.1/devops/backup_sources/repositories/artifactory/creating_backup_sources_repo.html index 94039f33532..7cfc886ac7a 100644 --- a/2.1/devops/backup_sources/repositories/artifactory/creating_backup_sources_repo.html +++ b/2.1/devops/backup_sources/repositories/artifactory/creating_backup_sources_repo.html @@ -166,7 +166,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/devops/backup_sources/sources_backup.html b/2.1/devops/backup_sources/sources_backup.html index c45bce31ea1..66e61a0bc48 100644 --- a/2.1/devops/backup_sources/sources_backup.html +++ b/2.1/devops/backup_sources/sources_backup.html @@ -261,7 +261,7 @@

Upload the packages

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/devops/conancenter/hosting_binaries.html b/2.1/devops/conancenter/hosting_binaries.html index 3a30f9556ea..550df1abc6c 100644 --- a/2.1/devops/conancenter/hosting_binaries.html +++ b/2.1/devops/conancenter/hosting_binaries.html @@ -158,7 +158,7 @@

Updating from upstream

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/devops/metadata.html b/2.1/devops/metadata.html index bfceeb1b091..1dcde67b38e 100644 --- a/2.1/devops/metadata.html +++ b/2.1/devops/metadata.html @@ -411,7 +411,7 @@

test_package as metadata

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/devops/save_restore.html b/2.1/devops/save_restore.html index 49caf45b5cd..2dcf89fda41 100644 --- a/2.1/devops/save_restore.html +++ b/2.1/devops/save_restore.html @@ -180,7 +180,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/devops/using_conancenter.html b/2.1/devops/using_conancenter.html index 91a9d354e44..370d0bd2654 100644 --- a/2.1/devops/using_conancenter.html +++ b/2.1/devops/using_conancenter.html @@ -239,7 +239,7 @@

Control and customization

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/devops/versioning.html b/2.1/devops/versioning.html index abfe7c1d63e..e4e3968d6b1 100644 --- a/2.1/devops/versioning.html +++ b/2.1/devops/versioning.html @@ -137,7 +137,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/devops/versioning/resolve_prereleases.html b/2.1/devops/versioning/resolve_prereleases.html index 7473e86fa9f..21d3b653732 100644 --- a/2.1/devops/versioning/resolve_prereleases.html +++ b/2.1/devops/versioning/resolve_prereleases.html @@ -181,7 +181,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples.html b/2.1/examples.html index 81939e456db..a1d439a8620 100644 --- a/2.1/examples.html +++ b/2.1/examples.html @@ -179,7 +179,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/commands.html b/2.1/examples/commands.html index 3a7a5db46f6..f063eaf9d9c 100644 --- a/2.1/examples/commands.html +++ b/2.1/examples/commands.html @@ -145,7 +145,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/commands/pkglists.html b/2.1/examples/commands/pkglists.html index 6367a81bcf2..9f6eb69a9ec 100644 --- a/2.1/examples/commands/pkglists.html +++ b/2.1/examples/commands/pkglists.html @@ -304,7 +304,7 @@

Removing packages lists

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/conanfile.html b/2.1/examples/conanfile.html index ebccb4c6f74..ee1fe52e4a3 100644 --- a/2.1/examples/conanfile.html +++ b/2.1/examples/conanfile.html @@ -151,7 +151,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/conanfile/layout.html b/2.1/examples/conanfile/layout.html index bf9b0d61567..293d33eadba 100644 --- a/2.1/examples/conanfile/layout.html +++ b/2.1/examples/conanfile/layout.html @@ -150,7 +150,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/conanfile/layout/conanfile_in_subfolder.html b/2.1/examples/conanfile/layout/conanfile_in_subfolder.html index 1080b330656..52d03985ffb 100644 --- a/2.1/examples/conanfile/layout/conanfile_in_subfolder.html +++ b/2.1/examples/conanfile/layout/conanfile_in_subfolder.html @@ -218,7 +218,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/conanfile/layout/editable_components.html b/2.1/examples/conanfile/layout/editable_components.html index 968fd2d116f..42618db388d 100644 --- a/2.1/examples/conanfile/layout/editable_components.html +++ b/2.1/examples/conanfile/layout/editable_components.html @@ -246,7 +246,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/conanfile/layout/multiple_subprojects.html b/2.1/examples/conanfile/layout/multiple_subprojects.html index 28672f1d680..6018d4dcb33 100644 --- a/2.1/examples/conanfile/layout/multiple_subprojects.html +++ b/2.1/examples/conanfile/layout/multiple_subprojects.html @@ -245,7 +245,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/conanfile/layout/third_party_libraries.html b/2.1/examples/conanfile/layout/third_party_libraries.html index 50f2704438b..4cd51a9519c 100644 --- a/2.1/examples/conanfile/layout/third_party_libraries.html +++ b/2.1/examples/conanfile/layout/third_party_libraries.html @@ -225,7 +225,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/conanfile/package_info.html b/2.1/examples/conanfile/package_info.html index 2235357523b..5d0607a5132 100644 --- a/2.1/examples/conanfile/package_info.html +++ b/2.1/examples/conanfile/package_info.html @@ -146,7 +146,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/conanfile/package_info/components.html b/2.1/examples/conanfile/package_info/components.html index 2b6ff21ffb2..ae6ae34cef8 100644 --- a/2.1/examples/conanfile/package_info/components.html +++ b/2.1/examples/conanfile/package_info/components.html @@ -348,7 +348,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/conanfile/package_info/package_info_conf_and_env.html b/2.1/examples/conanfile/package_info/package_info_conf_and_env.html index 0ef827bafb5..9ae4ae94c71 100644 --- a/2.1/examples/conanfile/package_info/package_info_conf_and_env.html +++ b/2.1/examples/conanfile/package_info/package_info_conf_and_env.html @@ -142,7 +142,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/config_files.html b/2.1/examples/config_files.html index 9ab2398306d..2b948604786 100644 --- a/2.1/examples/config_files.html +++ b/2.1/examples/config_files.html @@ -143,7 +143,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/config_files/settings/settings_user.html b/2.1/examples/config_files/settings/settings_user.html index c228927522a..9bab743afd9 100644 --- a/2.1/examples/config_files/settings/settings_user.html +++ b/2.1/examples/config_files/settings/settings_user.html @@ -369,7 +369,7 @@

Use your new settings

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/cross_build.html b/2.1/examples/cross_build.html index 9b217aaa454..2198a78bfd5 100644 --- a/2.1/examples/cross_build.html +++ b/2.1/examples/cross_build.html @@ -141,7 +141,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/cross_build/android/android_studio.html b/2.1/examples/cross_build/android/android_studio.html index 963aec7f171..0fdea593526 100644 --- a/2.1/examples/cross_build/android/android_studio.html +++ b/2.1/examples/cross_build/android/android_studio.html @@ -368,7 +368,7 @@

Building the application

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/cross_build/android/ndk.html b/2.1/examples/cross_build/android/ndk.html index c34994f42d3..f5006d9ee7a 100644 --- a/2.1/examples/cross_build/android/ndk.html +++ b/2.1/examples/cross_build/android/ndk.html @@ -195,7 +195,7 @@

Read more

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/dev_flow.html b/2.1/examples/dev_flow.html index 99b3ec29eb0..070aac42c2b 100644 --- a/2.1/examples/dev_flow.html +++ b/2.1/examples/dev_flow.html @@ -143,7 +143,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/dev_flow/debug/step_into_dependencies.html b/2.1/examples/dev_flow/debug/step_into_dependencies.html index b780c608374..7951683c7ed 100644 --- a/2.1/examples/dev_flow/debug/step_into_dependencies.html +++ b/2.1/examples/dev_flow/debug/step_into_dependencies.html @@ -201,7 +201,7 @@

Step into a dependency with Visual Studio

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/extensions.html b/2.1/examples/extensions.html index 388be03dad2..afb647e2dc8 100644 --- a/2.1/examples/extensions.html +++ b/2.1/examples/extensions.html @@ -157,7 +157,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/extensions/commands/clean/custom_command_clean_revisions.html b/2.1/examples/extensions/commands/clean/custom_command_clean_revisions.html index c1c33958143..88a88dfa97d 100644 --- a/2.1/examples/extensions/commands/clean/custom_command_clean_revisions.html +++ b/2.1/examples/extensions/commands/clean/custom_command_clean_revisions.html @@ -338,7 +338,7 @@

Conan public API

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/extensions/commands/custom_commands.html b/2.1/examples/extensions/commands/custom_commands.html index 3b4fe403f41..bfd02b65ed5 100644 --- a/2.1/examples/extensions/commands/custom_commands.html +++ b/2.1/examples/extensions/commands/custom_commands.html @@ -150,7 +150,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/extensions/deployers/builtin_deployers.html b/2.1/examples/extensions/deployers/builtin_deployers.html index 412e5434751..598a61bed8e 100644 --- a/2.1/examples/extensions/deployers/builtin_deployers.html +++ b/2.1/examples/extensions/deployers/builtin_deployers.html @@ -145,7 +145,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/extensions/deployers/custom_deployers.html b/2.1/examples/extensions/deployers/custom_deployers.html index b28511a8d2b..9b8b53ce3f7 100644 --- a/2.1/examples/extensions/deployers/custom_deployers.html +++ b/2.1/examples/extensions/deployers/custom_deployers.html @@ -150,7 +150,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/extensions/deployers/dev/development_deploy.html b/2.1/examples/extensions/deployers/dev/development_deploy.html index 9b5ee74abf0..cffea88a41a 100644 --- a/2.1/examples/extensions/deployers/dev/development_deploy.html +++ b/2.1/examples/extensions/deployers/dev/development_deploy.html @@ -258,7 +258,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/extensions/deployers/sources/custom_deployer_sources.html b/2.1/examples/extensions/deployers/sources/custom_deployer_sources.html index ebfadaec50a..0a9f064a442 100644 --- a/2.1/examples/extensions/deployers/sources/custom_deployer_sources.html +++ b/2.1/examples/extensions/deployers/sources/custom_deployer_sources.html @@ -218,7 +218,7 @@

deploy()

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/graph.html b/2.1/examples/graph.html index 1c9150b1fcb..ffdfe0fb714 100644 --- a/2.1/examples/graph.html +++ b/2.1/examples/graph.html @@ -149,7 +149,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/graph/requires/consume_cmake_macro.html b/2.1/examples/graph/requires/consume_cmake_macro.html index 044323ffd82..b7999833a39 100644 --- a/2.1/examples/graph/requires/consume_cmake_macro.html +++ b/2.1/examples/graph/requires/consume_cmake_macro.html @@ -210,7 +210,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/graph/tool_requires/different_options.html b/2.1/examples/graph/tool_requires/different_options.html index 64bd473514f..1c2d38d407e 100644 --- a/2.1/examples/graph/tool_requires/different_options.html +++ b/2.1/examples/graph/tool_requires/different_options.html @@ -233,7 +233,7 @@

Depending on same version of a tool-require with different options

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/graph/tool_requires/different_versions.html b/2.1/examples/graph/tool_requires/different_versions.html index 47ff026925f..b7c6e0d5348 100644 --- a/2.1/examples/graph/tool_requires/different_versions.html +++ b/2.1/examples/graph/tool_requires/different_versions.html @@ -231,7 +231,7 @@

Depending on different versions of the same tool-require

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/graph/tool_requires/use_cmake_modules.html b/2.1/examples/graph/tool_requires/use_cmake_modules.html index c4fb1e0abc4..96182362b55 100644 --- a/2.1/examples/graph/tool_requires/use_cmake_modules.html +++ b/2.1/examples/graph/tool_requires/use_cmake_modules.html @@ -222,7 +222,7 @@

Use cmake modules inside a

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/graph/tool_requires/using_protobuf.html b/2.1/examples/graph/tool_requires/using_protobuf.html index f189db8e80e..00211a8c3d0 100644 --- a/2.1/examples/graph/tool_requires/using_protobuf.html +++ b/2.1/examples/graph/tool_requires/using_protobuf.html @@ -360,7 +360,7 @@

© Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

diff --git a/2.1/examples/tools.html b/2.1/examples/tools.html index 520526072c5..9b4c9a74482 100644 --- a/2.1/examples/tools.html +++ b/2.1/examples/tools.html @@ -131,6 +131,7 @@
  • CMakeToolchain: Building your project using CMakePresets
  • CMakeToolchain: Extending your CMakePresets with Conan generated ones
  • CMakeToolchain: Inject arbitrary CMake variables into dependencies
  • +
  • CMakeToolchain: Using xxx-config.cmake files inside packages
  • tools.files
  • tools.files
  • @@ -140,6 +141,10 @@
  • CMakeToolchain: Extending your CMakePresets with Conan generated ones
  • CMakeToolchain: Inject arbitrary CMake variables into dependencies
  • +
  • CMakeToolchain: Using xxx-config.cmake files inside packages +
  • @@ -156,7 +161,7 @@

    © Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

    diff --git a/2.1/examples/tools/cmake/cmake_toolchain/build_project_cmake_presets.html b/2.1/examples/tools/cmake/cmake_toolchain/build_project_cmake_presets.html index c4fe002f9db..eeb479ba5fb 100644 --- a/2.1/examples/tools/cmake/cmake_toolchain/build_project_cmake_presets.html +++ b/2.1/examples/tools/cmake/cmake_toolchain/build_project_cmake_presets.html @@ -81,6 +81,7 @@
  • CMakeToolchain: Building your project using CMakePresets
  • CMakeToolchain: Extending your CMakePresets with Conan generated ones
  • CMakeToolchain: Inject arbitrary CMake variables into dependencies
  • +
  • CMakeToolchain: Using xxx-config.cmake files inside packages
  • tools.files
  • @@ -220,7 +221,7 @@

    Building the project using

    © Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

    diff --git a/2.1/examples/tools/cmake/cmake_toolchain/extend_own_cmake_presets.html b/2.1/examples/tools/cmake/cmake_toolchain/extend_own_cmake_presets.html index c5884e16081..bf2f4cfbc9a 100644 --- a/2.1/examples/tools/cmake/cmake_toolchain/extend_own_cmake_presets.html +++ b/2.1/examples/tools/cmake/cmake_toolchain/extend_own_cmake_presets.html @@ -81,6 +81,7 @@
  • CMakeToolchain: Building your project using CMakePresets
  • CMakeToolchain: Extending your CMakePresets with Conan generated ones
  • CMakeToolchain: Inject arbitrary CMake variables into dependencies
  • +
  • CMakeToolchain: Using xxx-config.cmake files inside packages
  • tools.files
  • @@ -261,7 +262,7 @@

    © Copyright 2016-2024, JFrog. - Last updated on Feb 21, 2024. + Last updated on Feb 23, 2024.

    diff --git a/2.1/examples/tools/cmake/cmake_toolchain/inject_cmake_variables.html b/2.1/examples/tools/cmake/cmake_toolchain/inject_cmake_variables.html index 9aa5f5e66b0..a914e187d11 100644 --- a/2.1/examples/tools/cmake/cmake_toolchain/inject_cmake_variables.html +++ b/2.1/examples/tools/cmake/cmake_toolchain/inject_cmake_variables.html @@ -25,7 +25,7 @@ - + @@ -81,6 +81,7 @@
  • CMakeToolchain: Building your project using CMakePresets
  • CMakeToolchain: Extending your CMakePresets with Conan generated ones
  • CMakeToolchain: Inject arbitrary CMake variables into dependencies
  • +
  • CMakeToolchain: Using xxx-config.cmake files inside packages
  • tools.files
  • @@ -210,14 +211,14 @@