diff options
| author | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2023-03-17 19:38:27 +0300 |
|---|---|---|
| committer | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2023-03-17 19:38:27 +0300 |
| commit | 26147c4e01ae75f397d4dd999da238bf2c61c851 (patch) | |
| tree | 873a652bca08f38df296c77422b40fd404f0481e /contrib/libs/cxxsupp | |
| parent | 08f6d0d9bb84f493c5dfd3c0d1568445faa26d85 (diff) | |
| download | ydb-26147c4e01ae75f397d4dd999da238bf2c61c851.tar.gz | |
External build system generator release 21
Update tools: yexport
Diffstat (limited to 'contrib/libs/cxxsupp')
| -rw-r--r-- | contrib/libs/cxxsupp/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/builtins/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxrt/CMakeLists.txt | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/contrib/libs/cxxsupp/CMakeLists.txt b/contrib/libs/cxxsupp/CMakeLists.txt index d90657116d..a692f90f36 100644 --- a/contrib/libs/cxxsupp/CMakeLists.txt +++ b/contrib/libs/cxxsupp/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/contrib/libs/cxxsupp/builtins/CMakeLists.txt b/contrib/libs/cxxsupp/builtins/CMakeLists.txt index 8f8c04afe5..7243bc137a 100644 --- a/contrib/libs/cxxsupp/builtins/CMakeLists.txt +++ b/contrib/libs/cxxsupp/builtins/CMakeLists.txt @@ -6,10 +6,10 @@ # 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 (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/contrib/libs/cxxsupp/libcxx/CMakeLists.txt b/contrib/libs/cxxsupp/libcxx/CMakeLists.txt index d90657116d..a692f90f36 100644 --- a/contrib/libs/cxxsupp/libcxx/CMakeLists.txt +++ b/contrib/libs/cxxsupp/libcxx/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/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt index 8f8c04afe5..7243bc137a 100644 --- a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt +++ b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt @@ -6,10 +6,10 @@ # 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 (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/contrib/libs/cxxsupp/libcxxrt/CMakeLists.txt b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.txt index 8f8c04afe5..7243bc137a 100644 --- a/contrib/libs/cxxsupp/libcxxrt/CMakeLists.txt +++ b/contrib/libs/cxxsupp/libcxxrt/CMakeLists.txt @@ -6,10 +6,10 @@ # 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 (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() |