From 26147c4e01ae75f397d4dd999da238bf2c61c851 Mon Sep 17 00:00:00 2001 From: robot-ya-builder Date: Fri, 17 Mar 2023 19:38:27 +0300 Subject: External build system generator release 21 Update tools: yexport --- library/cpp/json/CMakeLists.txt | 6 +++--- library/cpp/json/common/CMakeLists.txt | 6 +++--- library/cpp/json/easy_parse/CMakeLists.txt | 6 +++--- library/cpp/json/fast_sax/CMakeLists.txt | 6 +++--- library/cpp/json/writer/CMakeLists.txt | 6 +++--- library/cpp/json/yson/CMakeLists.txt | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'library/cpp/json') diff --git a/library/cpp/json/CMakeLists.txt b/library/cpp/json/CMakeLists.txt index d90657116d0..a692f90f36e 100644 --- a/library/cpp/json/CMakeLists.txt +++ b/library/cpp/json/CMakeLists.txt @@ -6,12 +6,12 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") include(CMakeLists.linux-aarch64.txt) -elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.darwin-x86_64.txt) elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) include(CMakeLists.windows-x86_64.txt) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) include(CMakeLists.linux-x86_64.txt) endif() diff --git a/library/cpp/json/common/CMakeLists.txt b/library/cpp/json/common/CMakeLists.txt index d90657116d0..a692f90f36e 100644 --- a/library/cpp/json/common/CMakeLists.txt +++ b/library/cpp/json/common/CMakeLists.txt @@ -6,12 +6,12 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") include(CMakeLists.linux-aarch64.txt) -elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.darwin-x86_64.txt) elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) include(CMakeLists.windows-x86_64.txt) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) include(CMakeLists.linux-x86_64.txt) endif() diff --git a/library/cpp/json/easy_parse/CMakeLists.txt b/library/cpp/json/easy_parse/CMakeLists.txt index d90657116d0..a692f90f36e 100644 --- a/library/cpp/json/easy_parse/CMakeLists.txt +++ b/library/cpp/json/easy_parse/CMakeLists.txt @@ -6,12 +6,12 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") include(CMakeLists.linux-aarch64.txt) -elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.darwin-x86_64.txt) elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) include(CMakeLists.windows-x86_64.txt) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) include(CMakeLists.linux-x86_64.txt) endif() diff --git a/library/cpp/json/fast_sax/CMakeLists.txt b/library/cpp/json/fast_sax/CMakeLists.txt index d90657116d0..a692f90f36e 100644 --- a/library/cpp/json/fast_sax/CMakeLists.txt +++ b/library/cpp/json/fast_sax/CMakeLists.txt @@ -6,12 +6,12 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") include(CMakeLists.linux-aarch64.txt) -elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.darwin-x86_64.txt) elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) include(CMakeLists.windows-x86_64.txt) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) include(CMakeLists.linux-x86_64.txt) endif() diff --git a/library/cpp/json/writer/CMakeLists.txt b/library/cpp/json/writer/CMakeLists.txt index d90657116d0..a692f90f36e 100644 --- a/library/cpp/json/writer/CMakeLists.txt +++ b/library/cpp/json/writer/CMakeLists.txt @@ -6,12 +6,12 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") include(CMakeLists.linux-aarch64.txt) -elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.darwin-x86_64.txt) elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) include(CMakeLists.windows-x86_64.txt) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) include(CMakeLists.linux-x86_64.txt) endif() diff --git a/library/cpp/json/yson/CMakeLists.txt b/library/cpp/json/yson/CMakeLists.txt index d90657116d0..a692f90f36e 100644 --- a/library/cpp/json/yson/CMakeLists.txt +++ b/library/cpp/json/yson/CMakeLists.txt @@ -6,12 +6,12 @@ # original buildsystem will not be accepted. -if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID) +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") include(CMakeLists.linux-aarch64.txt) -elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") include(CMakeLists.darwin-x86_64.txt) elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) include(CMakeLists.windows-x86_64.txt) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAVE_CUDA) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) include(CMakeLists.linux-x86_64.txt) endif() -- cgit v1.3