diff options
| author | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2023-03-06 16:56:18 +0300 |
|---|---|---|
| committer | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2023-03-06 16:56:18 +0300 |
| commit | cbc0c479c131a1e63ca86fe98b031e1bcac725d8 (patch) | |
| tree | 12245a82da1c7f54d54befcfb7706643e8166505 /contrib/libs/apache | |
| parent | ea8e336dc456c44b848619e120a8f3643c6125af (diff) | |
| download | ydb-cbc0c479c131a1e63ca86fe98b031e1bcac725d8.tar.gz | |
External build system generator release 17
Update tools: yexport
Diffstat (limited to 'contrib/libs/apache')
| -rw-r--r-- | contrib/libs/apache/arrow/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | contrib/libs/apache/avro/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | contrib/libs/apache/orc/CMakeLists.darwin.txt | 12 | ||||
| -rw-r--r-- | contrib/libs/apache/orc/CMakeLists.linux-aarch64.txt | 12 | ||||
| -rw-r--r-- | contrib/libs/apache/orc/CMakeLists.linux.txt | 12 | ||||
| -rw-r--r-- | contrib/libs/apache/orc/CMakeLists.txt | 2 |
6 files changed, 39 insertions, 3 deletions
diff --git a/contrib/libs/apache/arrow/CMakeLists.txt b/contrib/libs/apache/arrow/CMakeLists.txt index 5bb4faffb4..eee324bb60 100644 --- a/contrib/libs/apache/arrow/CMakeLists.txt +++ b/contrib/libs/apache/arrow/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/contrib/libs/apache/avro/CMakeLists.txt b/contrib/libs/apache/avro/CMakeLists.txt index 5bb4faffb4..eee324bb60 100644 --- a/contrib/libs/apache/avro/CMakeLists.txt +++ b/contrib/libs/apache/avro/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/contrib/libs/apache/orc/CMakeLists.darwin.txt b/contrib/libs/apache/orc/CMakeLists.darwin.txt index 8cbea4aeb8..45e01d7a29 100644 --- a/contrib/libs/apache/orc/CMakeLists.darwin.txt +++ b/contrib/libs/apache/orc/CMakeLists.darwin.txt @@ -7,6 +7,18 @@ find_package(ZLIB REQUIRED) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) add_library(libs-apache-orc) target_compile_options(libs-apache-orc PRIVATE diff --git a/contrib/libs/apache/orc/CMakeLists.linux-aarch64.txt b/contrib/libs/apache/orc/CMakeLists.linux-aarch64.txt index 5a76ebf642..1a7d3d48e7 100644 --- a/contrib/libs/apache/orc/CMakeLists.linux-aarch64.txt +++ b/contrib/libs/apache/orc/CMakeLists.linux-aarch64.txt @@ -7,6 +7,18 @@ find_package(ZLIB REQUIRED) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) add_library(libs-apache-orc) target_compile_options(libs-apache-orc PRIVATE diff --git a/contrib/libs/apache/orc/CMakeLists.linux.txt b/contrib/libs/apache/orc/CMakeLists.linux.txt index 5a76ebf642..1a7d3d48e7 100644 --- a/contrib/libs/apache/orc/CMakeLists.linux.txt +++ b/contrib/libs/apache/orc/CMakeLists.linux.txt @@ -7,6 +7,18 @@ find_package(ZLIB REQUIRED) +get_built_tool_path( + TOOL_protoc_bin + TOOL_protoc_dependency + contrib/tools/protoc/bin + protoc +) +get_built_tool_path( + TOOL_cpp_styleguide_bin + TOOL_cpp_styleguide_dependency + contrib/tools/protoc/plugins/cpp_styleguide + cpp_styleguide +) add_library(libs-apache-orc) target_compile_options(libs-apache-orc PRIVATE diff --git a/contrib/libs/apache/orc/CMakeLists.txt b/contrib/libs/apache/orc/CMakeLists.txt index 5bb4faffb4..eee324bb60 100644 --- a/contrib/libs/apache/orc/CMakeLists.txt +++ b/contrib/libs/apache/orc/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() |