External build system generator release 17

Update tools: yexport

5 files changed, 41 insertions, 8 deletions

diff --git a/library/cpp/digest/old_crc/CMakeLists.darwin.txt b/library/cpp/digest/old_crc/CMakeLists.darwin.txt
index 247ca3494b..a4caa8c756 100644
--- a/library/cpp/digest/old_crc/CMakeLists.darwin.txt
+++ b/library/cpp/digest/old_crc/CMakeLists.darwin.txt
@@ -7,6 +7,12 @@
 
 
 add_subdirectory(gencrc)
+get_built_tool_path(
+  TOOL_gencrc_bin
+  TOOL_gencrc_dependency
+  library/cpp/digest/old_crc/gencrc
+  gencrc
+)
 
 add_library(cpp-digest-old_crc)
 target_link_libraries(cpp-digest-old_crc PUBLIC
@@ -21,9 +27,14 @@ add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/library/cpp/digest/old_crc/crc.inc
   DEPENDS
-  ${TOOLS_ROOT}/library/cpp/digest/old_crc/gencrc/gencrc
+  ${TOOL_gencrc_bin}
   COMMAND
-  ${TOOLS_ROOT}/library/cpp/digest/old_crc/gencrc/gencrc
+  ${TOOL_gencrc_bin}
   >
   crc.inc
 )
+if(NOT CMAKE_CROSSCOMPILING)
+  add_dependencies(cpp-digest-old_crc
+    gencrc
+)
+endif()
diff --git a/library/cpp/digest/old_crc/CMakeLists.linux-aarch64.txt b/library/cpp/digest/old_crc/CMakeLists.linux-aarch64.txt
index 9c1091a218..a0883b65f5 100644
--- a/library/cpp/digest/old_crc/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/digest/old_crc/CMakeLists.linux-aarch64.txt
@@ -7,6 +7,12 @@
 
 
 add_subdirectory(gencrc)
+get_built_tool_path(
+  TOOL_gencrc_bin
+  TOOL_gencrc_dependency
+  library/cpp/digest/old_crc/gencrc
+  gencrc
+)
 
 add_library(cpp-digest-old_crc)
 target_link_libraries(cpp-digest-old_crc PUBLIC
@@ -22,9 +28,14 @@ add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/library/cpp/digest/old_crc/crc.inc
   DEPENDS
-  ${TOOLS_ROOT}/library/cpp/digest/old_crc/gencrc/gencrc
+  ${TOOL_gencrc_bin}
   COMMAND
-  ${TOOLS_ROOT}/library/cpp/digest/old_crc/gencrc/gencrc
+  ${TOOL_gencrc_bin}
   >
   crc.inc
 )
+if(NOT CMAKE_CROSSCOMPILING)
+  add_dependencies(cpp-digest-old_crc
+    gencrc
+)
+endif()
diff --git a/library/cpp/digest/old_crc/CMakeLists.linux.txt b/library/cpp/digest/old_crc/CMakeLists.linux.txt
index 9c1091a218..a0883b65f5 100644
--- a/library/cpp/digest/old_crc/CMakeLists.linux.txt
+++ b/library/cpp/digest/old_crc/CMakeLists.linux.txt
@@ -7,6 +7,12 @@
 
 
 add_subdirectory(gencrc)
+get_built_tool_path(
+  TOOL_gencrc_bin
+  TOOL_gencrc_dependency
+  library/cpp/digest/old_crc/gencrc
+  gencrc
+)
 
 add_library(cpp-digest-old_crc)
 target_link_libraries(cpp-digest-old_crc PUBLIC
@@ -22,9 +28,14 @@ add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/library/cpp/digest/old_crc/crc.inc
   DEPENDS
-  ${TOOLS_ROOT}/library/cpp/digest/old_crc/gencrc/gencrc
+  ${TOOL_gencrc_bin}
   COMMAND
-  ${TOOLS_ROOT}/library/cpp/digest/old_crc/gencrc/gencrc
+  ${TOOL_gencrc_bin}
   >
   crc.inc
 )
+if(NOT CMAKE_CROSSCOMPILING)
+  add_dependencies(cpp-digest-old_crc
+    gencrc
+)
+endif()
diff --git a/library/cpp/digest/old_crc/CMakeLists.txt b/library/cpp/digest/old_crc/CMakeLists.txt
index 5bb4faffb4..eee324bb60 100644
--- a/library/cpp/digest/old_crc/CMakeLists.txt
+++ b/library/cpp/digest/old_crc/CMakeLists.txt
@@ -10,6 +10,6 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT AND
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
   include(CMakeLists.darwin.txt)
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
   include(CMakeLists.linux.txt)
 endif()
diff --git a/library/cpp/digest/old_crc/gencrc/CMakeLists.txt b/library/cpp/digest/old_crc/gencrc/CMakeLists.txt
index 5bb4faffb4..eee324bb60 100644
--- a/library/cpp/digest/old_crc/gencrc/CMakeLists.txt
+++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.txt
@@ -10,6 +10,6 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT AND
   include(CMakeLists.linux-aarch64.txt)
 elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
   include(CMakeLists.darwin.txt)
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA)
   include(CMakeLists.linux.txt)
 endif()