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 /library/cpp/protobuf/util | |
| parent | ea8e336dc456c44b848619e120a8f3643c6125af (diff) | |
| download | ydb-cbc0c479c131a1e63ca86fe98b031e1bcac725d8.tar.gz | |
External build system generator release 17
Update tools: yexport
Diffstat (limited to 'library/cpp/protobuf/util')
5 files changed, 38 insertions, 2 deletions
diff --git a/library/cpp/protobuf/util/CMakeLists.txt b/library/cpp/protobuf/util/CMakeLists.txt index 5bb4faffb4..eee324bb60 100644 --- a/library/cpp/protobuf/util/CMakeLists.txt +++ b/library/cpp/protobuf/util/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/protobuf/util/proto/CMakeLists.darwin.txt b/library/cpp/protobuf/util/proto/CMakeLists.darwin.txt index 33cfab6c43..7a58b4bfeb 100644 --- a/library/cpp/protobuf/util/proto/CMakeLists.darwin.txt +++ b/library/cpp/protobuf/util/proto/CMakeLists.darwin.txt @@ -6,6 +6,18 @@ # original buildsystem will not be accepted. +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(protobuf-util-proto) target_link_libraries(protobuf-util-proto PUBLIC diff --git a/library/cpp/protobuf/util/proto/CMakeLists.linux-aarch64.txt b/library/cpp/protobuf/util/proto/CMakeLists.linux-aarch64.txt index ae8c2efd18..5f08e7a691 100644 --- a/library/cpp/protobuf/util/proto/CMakeLists.linux-aarch64.txt +++ b/library/cpp/protobuf/util/proto/CMakeLists.linux-aarch64.txt @@ -6,6 +6,18 @@ # original buildsystem will not be accepted. +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(protobuf-util-proto) target_link_libraries(protobuf-util-proto PUBLIC diff --git a/library/cpp/protobuf/util/proto/CMakeLists.linux.txt b/library/cpp/protobuf/util/proto/CMakeLists.linux.txt index ae8c2efd18..5f08e7a691 100644 --- a/library/cpp/protobuf/util/proto/CMakeLists.linux.txt +++ b/library/cpp/protobuf/util/proto/CMakeLists.linux.txt @@ -6,6 +6,18 @@ # original buildsystem will not be accepted. +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(protobuf-util-proto) target_link_libraries(protobuf-util-proto PUBLIC diff --git a/library/cpp/protobuf/util/proto/CMakeLists.txt b/library/cpp/protobuf/util/proto/CMakeLists.txt index 5bb4faffb4..eee324bb60 100644 --- a/library/cpp/protobuf/util/proto/CMakeLists.txt +++ b/library/cpp/protobuf/util/proto/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() |