diff options
| author | dimdim11 <dimdim11@yandex-team.com> | 2024-07-08 10:06:07 +0300 |
|---|---|---|
| committer | dimdim11 <dimdim11@yandex-team.com> | 2024-07-08 10:19:09 +0300 |
| commit | fe8133de2464d069bfedc6f65b5156c12db4aa2f (patch) | |
| tree | 26e2eaa1680a483082a04ed28cebebb8467036f3 /build/export_generators/cmake/generator.toml | |
| parent | 8559b4b939beae62d76b5f217510f07bf8389a76 (diff) | |
| download | ydb-fe8133de2464d069bfedc6f65b5156c12db4aa2f.tar.gz | |
Conan2 support by use_conan2 flag in yexport.toml
Conan2 support by use_conan2 flag in yexport.toml
53b2f6c57e617e4efacd04b2205da51579655ac8
Diffstat (limited to 'build/export_generators/cmake/generator.toml')
| -rw-r--r-- | build/export_generators/cmake/generator.toml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/export_generators/cmake/generator.toml b/build/export_generators/cmake/generator.toml index a39e474390..ec271bb6f8 100644 --- a/build/export_generators/cmake/generator.toml +++ b/build/export_generators/cmake/generator.toml @@ -30,7 +30,7 @@ android-x86_64="ANDROID AND CMAKE_ANDROID_ARCH STREQUAL \"x86_64\"" [root] templates=[ - { path="conanfile.jinja", dest="conanfile.txt" }, + { path="conanfile.py.jinja", dest="conanfile.py" }, { path="root_cmake_lists.jinja", dest="CMakeLists.txt" }, { path="root_global_vars.jinja", dest="cmake/global_vars.cmake" }, ] @@ -269,8 +269,8 @@ attrs=[ "conan-options", "conan-generators", ] -copy=["cmake/conan.cmake"] -add_values=[{attr="includes", values=["cmake/conan.cmake"]}] +copy=["cmake/conan1_deprecated.cmake", "cmake/conan_provider.cmake"] +add_values=[{attr="includes", values=["cmake/conan1_deprecated.cmake"]}] [[rules]] attrs=[ |