Enable Conan2 in CatBoost export... Fix #2582

commit_hash:a800c78104fd097ab08ea50f8573f672be0ffcd1

8 files changed, 34 insertions, 42 deletions

diff --git a/build/export_generators/cmake/cmake/conan-profiles/android.arm64.profile b/build/export_generators/cmake/cmake/conan-profiles/android.arm64.profile
index 6147d99225..0f08282c77 100644
--- a/build/export_generators/cmake/cmake/conan-profiles/android.arm64.profile
+++ b/build/export_generators/cmake/cmake/conan-profiles/android.arm64.profile
@@ -11,5 +11,3 @@ os.api_level=21
 [tool_requires]
 android-ndk/r25
 [options]
-[env]
-
diff --git a/build/export_generators/cmake/cmake/conan-profiles/android.armv7.profile b/build/export_generators/cmake/cmake/conan-profiles/android.armv7.profile
index 57d8f55785..9419ed1ba8 100644
--- a/build/export_generators/cmake/cmake/conan-profiles/android.armv7.profile
+++ b/build/export_generators/cmake/cmake/conan-profiles/android.armv7.profile
@@ -11,5 +11,3 @@ os.api_level=21
 [tool_requires]
 android-ndk/r25
 [options]
-[env]
-
diff --git a/build/export_generators/cmake/cmake/conan-profiles/android.x86.profile b/build/export_generators/cmake/cmake/conan-profiles/android.x86.profile
index d8b73b992c..101b70af76 100644
--- a/build/export_generators/cmake/cmake/conan-profiles/android.x86.profile
+++ b/build/export_generators/cmake/cmake/conan-profiles/android.x86.profile
@@ -11,5 +11,3 @@ os.api_level=21
 [tool_requires]
 android-ndk/r25
 [options]
-[env]
-
diff --git a/build/export_generators/cmake/cmake/conan-profiles/android.x86_64.profile b/build/export_generators/cmake/cmake/conan-profiles/android.x86_64.profile
index 50ad337afa..7cb2b0c907 100644
--- a/build/export_generators/cmake/cmake/conan-profiles/android.x86_64.profile
+++ b/build/export_generators/cmake/cmake/conan-profiles/android.x86_64.profile
@@ -11,5 +11,3 @@ os.api_level=21
 [tool_requires]
 android-ndk/r25
 [options]
-[env]
-
diff --git a/build/export_generators/cmake/cmake/conan-profiles/linux.aarch64.profile b/build/export_generators/cmake/cmake/conan-profiles/linux.aarch64.profile
index 6945b1d777..533bfbdd1e 100644
--- a/build/export_generators/cmake/cmake/conan-profiles/linux.aarch64.profile
+++ b/build/export_generators/cmake/cmake/conan-profiles/linux.aarch64.profile
@@ -1,6 +1,6 @@
-include(default)
+{% set target_host = 'aarch64-linux-gnu' %}
 
-target_host=aarch64-linux-gnu
+include(default)
 
 [settings]
 arch=armv8
@@ -12,17 +12,18 @@ compiler.cppstd=20
 os=Linux
 [options]
 
-[env]
-CONAN_CMAKE_FIND_ROOT_PATH=/usr/$target_host
-CONAN_CMAKE_SYSROOT=/usr/$target_host
-SYSROOT=/usr/$target_host
-CC=$target_host-gcc
-CXX=$target_host-g++
-CXXFLAGS="-I/usr/$target_host/include/"
-CFLAGS="-I/usr/$target_host/include/"
-CHOST=$target_host
-AR=$target_host-ar
-AS=$target_host-as
-RANLIB=$target_host-ranlib
-LD=$target_host-ld
-STRIP=$target_host-strip
+[buildenv]
+PATH=+(path)/usr/{{target_host}}/bin
+CONAN_CMAKE_FIND_ROOT_PATH=/usr/{{target_host}}
+CONAN_CMAKE_SYSROOT=/usr/{{target_host}}
+SYSROOT=/usr/{{target_host}}
+CC={{target_host}}-gcc
+CXX={{target_host}}-g++
+CXXFLAGS=-I/usr/{{target_host}}/include/
+CFLAGS=-I/usr/{{target_host}}/include/
+CHOST={{target_host}}
+AR={{target_host}}-ar
+AS={{target_host}}-as
+RANLIB={{target_host}}-ranlib
+LD={{target_host}}-ld
+STRIP={{target_host}}-strip
diff --git a/build/export_generators/cmake/cmake/conan-profiles/linux.ppc64le.profile b/build/export_generators/cmake/cmake/conan-profiles/linux.ppc64le.profile
index 5ecd24d6ce..e688123b00 100644
--- a/build/export_generators/cmake/cmake/conan-profiles/linux.ppc64le.profile
+++ b/build/export_generators/cmake/cmake/conan-profiles/linux.ppc64le.profile
@@ -1,6 +1,6 @@
-include(default)
+{% set target_host = 'powerpc64le-linux-gnu' %}
 
-target_host=powerpc64le-linux-gnu
+include(default)
 
 [settings]
 arch=ppc64le
@@ -12,17 +12,18 @@ compiler.cppstd=20
 os=Linux
 [options]
 
-[env]
-CONAN_CMAKE_FIND_ROOT_PATH=/usr/$target_host
-CONAN_CMAKE_SYSROOT=/usr/$target_host
-SYSROOT=/usr/$target_host
-CC=$target_host-gcc
-CXX=$target_host-g++
-CXXFLAGS="-I/usr/$target_host/include/"
-CFLAGS="-I/usr/$target_host/include/"
-CHOST=$target_host
-AR=$target_host-ar
-AS=$target_host-as
-RANLIB=$target_host-ranlib
-LD=$target_host-ld
-STRIP=$target_host-strip
+[buildenv]
+PATH=+(path)/usr/{{target_host}}/bin
+CONAN_CMAKE_FIND_ROOT_PATH=/usr/{{target_host}}
+CONAN_CMAKE_SYSROOT=/usr/{{target_host}}
+SYSROOT=/usr/{{target_host}}
+CC={{target_host}}-gcc
+CXX={{target_host}}-g++
+CXXFLAGS=-I/usr/{{target_host}}/include/
+CFLAGS=-I/usr/{{target_host}}/include/
+CHOST={{target_host}}
+AR={{target_host}}-ar
+AS={{target_host}}-as
+RANLIB={{target_host}}-ranlib
+LD={{target_host}}-ld
+STRIP={{target_host}}-strip
diff --git a/build/export_generators/cmake/cmake/conan-profiles/macos.arm64.profile b/build/export_generators/cmake/cmake/conan-profiles/macos.arm64.profile
index 52ba46ab97..f215fd1592 100644
--- a/build/export_generators/cmake/cmake/conan-profiles/macos.arm64.profile
+++ b/build/export_generators/cmake/cmake/conan-profiles/macos.arm64.profile
@@ -8,4 +8,3 @@ compiler.version=14
 compiler.cppstd=20
 os=Macos
 [options]
-[env]
diff --git a/build/export_generators/cmake/cmake/conan-profiles/macos.x86_64.profile b/build/export_generators/cmake/cmake/conan-profiles/macos.x86_64.profile
index 3370b88548..a741d197e1 100644
--- a/build/export_generators/cmake/cmake/conan-profiles/macos.x86_64.profile
+++ b/build/export_generators/cmake/cmake/conan-profiles/macos.x86_64.profile
@@ -8,4 +8,3 @@ compiler.version=14
 compiler.cppstd=20
 os=Macos
 [options]
-[env]