diff options
| author | serg-belyakov <serg-belyakov@yandex-team.com> | 2022-07-08 17:02:48 +0300 |
|---|---|---|
| committer | serg-belyakov <serg-belyakov@yandex-team.com> | 2022-07-08 17:02:48 +0300 |
| commit | e5eab3309e308a5713727c7f9c506b51b6d32af7 (patch) | |
| tree | ec1a4a74e457682dbc96582556a1e956635397c7 | |
| parent | df4076b5d5f03459384ffadd5e48f63797ddc87f (diff) | |
| download | ydb-e5eab3309e308a5713727c7f9c506b51b6d32af7.tar.gz | |
Add logging after applying new GroupInfo,
343 files changed, 480 insertions, 446 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1324505561..ea2139cfbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,108 +15,6 @@ set(CMAKE_CXX_EXTENSIONS Off) set(YDB_MAX_LINK_JOBS 5 CACHE STRING "Maximum parallel link jobs for Ninja generator") set_property(GLOBAL PROPERTY JOB_POOLS link_jobs=${YDB_MAX_LINK_JOBS}) set(CMAKE_JOB_POOL_LINK link_jobs) -set(CMAKE_C_FLAGS "\ - -m64 \ - -fexceptions \ - -fno-common \ - -fuse-init-array \ - -fcolor-diagnostics \ - -faligned-allocation \ - -ffunction-sections \ - -fdata-sections \ - -Wall \ - -Wextra \ - -Wno-parentheses \ - -Wno-implicit-const-int-float-conversion \ - -Wno-unknown-warning-option \ - -D_THREAD_SAFE \ - -D_PTHREADS \ - -D_REENTRANT \ - -D_LARGEFILE_SOURCE \ - -D__STDC_CONSTANT_MACROS \ - -D__STDC_FORMAT_MACROS \ - -D_FILE_OFFSET_BITS=64 \ - -D_GNU_SOURCE \ - -D_YNDX_LIBUNWIND_ENABLE_EXCEPTION_BACKTRACE \ - -D__LONG_LONG_SUPPORTED \ - -DSSE_ENABLED=1 \ - -DSSE3_ENABLED=1 \ - -DSSSE3_ENABLED=1 \ - -DSSE41_ENABLED=1 \ - -DSSE42_ENABLED=1 \ - -DPOPCNT_ENABLED=1 \ - -DCX16_ENABLED=1 \ - -D_libunwind_ \ - -DLIBCXX_BUILDING_LIBCXXRT \ - -msse2 \ - -msse3 \ - -mssse3 \ - -msse4.1 \ - -msse4.2 \ - -mpopcnt \ - -mcx16 \ - " -) -set(CMAKE_CXX_FLAGS "\ - -m64 \ - -fexceptions \ - -fno-common \ - -fuse-init-array \ - -fcolor-diagnostics \ - -faligned-allocation \ - -ffunction-sections \ - -fdata-sections \ - -Wall \ - -Wextra \ - -Wno-parentheses \ - -Wno-implicit-const-int-float-conversion \ - -Wno-unknown-warning-option \ - -D_THREAD_SAFE \ - -D_PTHREADS \ - -D_REENTRANT \ - -D_LARGEFILE_SOURCE \ - -D__STDC_CONSTANT_MACROS \ - -D__STDC_FORMAT_MACROS \ - -D_FILE_OFFSET_BITS=64 \ - -D_GNU_SOURCE \ - -D_YNDX_LIBUNWIND_ENABLE_EXCEPTION_BACKTRACE \ - -D__LONG_LONG_SUPPORTED \ - -DSSE_ENABLED=1 \ - -DSSE3_ENABLED=1 \ - -DSSSE3_ENABLED=1 \ - -DSSE41_ENABLED=1 \ - -DSSE42_ENABLED=1 \ - -DPOPCNT_ENABLED=1 \ - -DCX16_ENABLED=1 \ - -D_libunwind_ \ - -DLIBCXX_BUILDING_LIBCXXRT \ - -msse2 \ - -msse3 \ - -mssse3 \ - -msse4.1 \ - -msse4.2 \ - -mpopcnt \ - -mcx16 \ - -Woverloaded-virtual \ - -Wimport-preprocessor-directive-pedantic \ - -Wno-undefined-var-template \ - -Wno-return-std-move \ - -Wno-address-of-packed-member \ - -Wno-defaulted-function-deleted \ - -Wno-pessimizing-move \ - -Wno-range-loop-construct \ - -Wno-deprecated-anon-enum-enum-conversion \ - -Wno-deprecated-enum-enum-conversion \ - -Wno-deprecated-enum-float-conversion \ - -Wno-ambiguous-reversed-operator \ - -Wno-deprecated-volatile \ - " -) -add_link_options( - -nodefaultlibs - -lc - -lm -) list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake) include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) @@ -125,6 +23,7 @@ enable_testing() include(cmake/antlr.cmake) include(cmake/bison.cmake) include(cmake/conan.cmake) +include(cmake/global_flags.cmake) include(cmake/llvm-tools.cmake) include(cmake/protobuf.cmake) include(cmake/yandex_common.cmake) @@ -157,7 +56,7 @@ conan_cmake_install( SETTINGS ${settings} ) -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) elseif (APPLE) include(CMakeLists.darwin.txt) diff --git a/build/scripts/export_script_gen.py b/build/scripts/export_script_gen.py index 269af2e3ca..64b732eff5 100644 --- a/build/scripts/export_script_gen.py +++ b/build/scripts/export_script_gen.py @@ -85,17 +85,20 @@ def to_msvc(src, dest): def to_darwin(src, dest): + pre = '' for item in parse_export_file(src): if item.get('linux_version'): continue if item['lang'] == 'C': - dest.write('-Wl,-exported_symbol,_' + item['sym']) + dest.write(pre + '-Wl,-exported_symbol,_' + item['sym']) elif item['lang'] == 'C++': for sym in to_c(item['sym']): - dest.write('-Wl,-exported_symbol,_' + sym) + dest.write(pre + '-Wl,-exported_symbol,_' + sym) else: raise Exception('unsupported lang: ' + item['lang']) + if pre == '': + pre = ' ' def main(): diff --git a/cmake/global_flags.cmake b/cmake/global_flags.cmake new file mode 100644 index 0000000000..dc68e42d12 --- /dev/null +++ b/cmake/global_flags.cmake @@ -0,0 +1,106 @@ +set(CMAKE_C_FLAGS "\ + -m64 \ + -fexceptions \ + -fno-common \ + -fcolor-diagnostics \ + -faligned-allocation \ + -ffunction-sections \ + -fdata-sections \ + -Wall \ + -Wextra \ + -Wno-parentheses \ + -Wno-implicit-const-int-float-conversion \ + -Wno-unknown-warning-option \ + -D_THREAD_SAFE \ + -D_PTHREADS \ + -D_REENTRANT \ + -D_LARGEFILE_SOURCE \ + -D__STDC_CONSTANT_MACROS \ + -D__STDC_FORMAT_MACROS \ + -D_FILE_OFFSET_BITS=64 \ + -D_GNU_SOURCE \ + -D_YNDX_LIBUNWIND_ENABLE_EXCEPTION_BACKTRACE \ + -D__LONG_LONG_SUPPORTED \ + -DSSE_ENABLED=1 \ + -DSSE3_ENABLED=1 \ + -DSSSE3_ENABLED=1 \ + -DSSE41_ENABLED=1 \ + -DSSE42_ENABLED=1 \ + -DPOPCNT_ENABLED=1 \ + -DCX16_ENABLED=1 \ + -D_libunwind_ \ + -DLIBCXX_BUILDING_LIBCXXRT \ + -msse2 \ + -msse3 \ + -mssse3 \ + -msse4.1 \ + -msse4.2 \ + -mpopcnt \ + -mcx16 \ + " +) +set(CMAKE_CXX_FLAGS "\ + -m64 \ + -fexceptions \ + -fno-common \ + -fcolor-diagnostics \ + -faligned-allocation \ + -ffunction-sections \ + -fdata-sections \ + -Wall \ + -Wextra \ + -Wno-parentheses \ + -Wno-implicit-const-int-float-conversion \ + -Wno-unknown-warning-option \ + -D_THREAD_SAFE \ + -D_PTHREADS \ + -D_REENTRANT \ + -D_LARGEFILE_SOURCE \ + -D__STDC_CONSTANT_MACROS \ + -D__STDC_FORMAT_MACROS \ + -D_FILE_OFFSET_BITS=64 \ + -D_GNU_SOURCE \ + -D_YNDX_LIBUNWIND_ENABLE_EXCEPTION_BACKTRACE \ + -D__LONG_LONG_SUPPORTED \ + -DSSE_ENABLED=1 \ + -DSSE3_ENABLED=1 \ + -DSSSE3_ENABLED=1 \ + -DSSE41_ENABLED=1 \ + -DSSE42_ENABLED=1 \ + -DPOPCNT_ENABLED=1 \ + -DCX16_ENABLED=1 \ + -D_libunwind_ \ + -DLIBCXX_BUILDING_LIBCXXRT \ + -msse2 \ + -msse3 \ + -mssse3 \ + -msse4.1 \ + -msse4.2 \ + -mpopcnt \ + -mcx16 \ + -Woverloaded-virtual \ + -Wimport-preprocessor-directive-pedantic \ + -Wno-undefined-var-template \ + -Wno-return-std-move \ + -Wno-address-of-packed-member \ + -Wno-defaulted-function-deleted \ + -Wno-pessimizing-move \ + -Wno-range-loop-construct \ + -Wno-deprecated-anon-enum-enum-conversion \ + -Wno-deprecated-enum-enum-conversion \ + -Wno-deprecated-enum-float-conversion \ + -Wno-ambiguous-reversed-operator \ + -Wno-deprecated-volatile \ + " +) +add_link_options( + -nodefaultlibs + -lc + -lm +) +if (APPLE) + set(CMAKE_SHARED_LINKER_FLAGS "-undefined dynamic_lookup") +elseif(UNIX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-init-array") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-init-array") +endif() diff --git a/cmake/global_vars.cmake b/cmake/global_vars.cmake index 3b48b3cf4a..9b3d4248d2 100644 --- a/cmake/global_vars.cmake +++ b/cmake/global_vars.cmake @@ -6,7 +6,7 @@ # original buildsystem will not be accepted. -if(UNIX) +if(UNIX AND NOT APPLE) set(YASM_FLAGS -f elf64 -D UNIX -D _x86_64_ -D_YASM_ -g dwarf2) set(BISON_FLAGS -v) set(RAGEL_FLAGS -L -I ${CMAKE_SOURCE_DIR}/) diff --git a/cmake/llvm-tools.cmake b/cmake/llvm-tools.cmake index b53345232a..b727e8f720 100644 --- a/cmake/llvm-tools.cmake +++ b/cmake/llvm-tools.cmake @@ -10,6 +10,18 @@ else() endif() endif() +if (CMAKE_C_COMPILER_ID MATCHES "Clang") + set(CLANGC ${CMAKE_C_COMPILER}) + message(STATUS "Using ${CLANGC} for c++ to LLVM IR translation") +else() + find_program(CLANGC NAMES clang-12 clang) + if (CLANGC "CLANGC-NOTFOUND") + message(SEND_ERROR "clang not found") + else() + message(STATUS "Using ${CLANGC} for c to LLVM IR translation") + endif() +endif() + find_program(LLVMLINK NAMES llvm-link-12 llvm-link) if (LLVMLINK MATCHES "LLVMLINK-NOTFOUND") message(SEND_ERROR "llvm-link not found") @@ -23,10 +35,15 @@ else() message(STATUS "Using ${LLVMOPT} for LLVM IR optimization") endif() -function(llvm_compile_cxx Tgt Inpt Out Tool) +function(llvm_compile_cxx Tgt Inpt Out Tool UseC) list(APPEND TARGET_INCLUDES "-I$<JOIN:$<TARGET_PROPERTY:${Tgt},INCLUDE_DIRECTORIES>,$<SEMICOLON>-I>") list(APPEND TARGET_COMPILE_OPTIONS "$<JOIN:$<TARGET_PROPERTY:${Tgt},COMPILE_OPTIONS>,$<SEMICOLON>>") - get_target_property(TARGET_STANDARD ${Tgt} CXX_STANDARD) + if (${UseC}) + set(STD_FLAG "") + else() + get_target_property(TARGET_STANDARD ${Tgt} CXX_STANDARD) + set(STD_FLAG "-std=c++${TARGET_STANDARD}") + endif() add_custom_command( OUTPUT ${Out} @@ -34,7 +51,7 @@ function(llvm_compile_cxx Tgt Inpt Out Tool) ${Tool} ${TARGET_INCLUDES} ${TARGET_COMPILE_OPTIONS} - -std=c++${TARGET_STANDARD} + ${STD_FLAG} -Wno-unknown-warning-option -fno-lto -emit-llvm @@ -46,3 +63,7 @@ function(llvm_compile_cxx Tgt Inpt Out Tool) DEPENDS ${Inpt} ${Tool} ) endfunction() + +function(llvm_compile_c Tgt Inpt Out Tool) + llvm_compile_cxx(${Tgt} ${Inpt} ${Out} ${Tool} TRUE) +endfunction() diff --git a/contrib/libs/apache/avro/CMakeLists.txt b/contrib/libs/apache/avro/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/apache/avro/CMakeLists.txt +++ b/contrib/libs/apache/avro/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/cctz/CMakeLists.txt b/contrib/libs/cctz/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/libs/cctz/CMakeLists.txt +++ b/contrib/libs/cctz/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/curl/CMakeLists.txt b/contrib/libs/curl/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/libs/curl/CMakeLists.txt +++ b/contrib/libs/curl/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/cxxsupp/builtins/CMakeLists.txt b/contrib/libs/cxxsupp/builtins/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/libs/cxxsupp/builtins/CMakeLists.txt +++ b/contrib/libs/cxxsupp/builtins/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/expat/CMakeLists.txt b/contrib/libs/expat/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/expat/CMakeLists.txt +++ b/contrib/libs/expat/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/jemalloc/CMakeLists.txt b/contrib/libs/jemalloc/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/libs/jemalloc/CMakeLists.txt +++ b/contrib/libs/jemalloc/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/libc_compat/CMakeLists.txt b/contrib/libs/libc_compat/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/libs/libc_compat/CMakeLists.txt +++ b/contrib/libs/libc_compat/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/libevent/event_core/CMakeLists.txt b/contrib/libs/libevent/event_core/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/libs/libevent/event_core/CMakeLists.txt +++ b/contrib/libs/libevent/event_core/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/libunwind/CMakeLists.txt b/contrib/libs/libunwind/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/libs/libunwind/CMakeLists.txt +++ b/contrib/libs/libunwind/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/linuxvdso/CMakeLists.txt b/contrib/libs/linuxvdso/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/libs/linuxvdso/CMakeLists.txt +++ b/contrib/libs/linuxvdso/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/linuxvdso/original/CMakeLists.txt b/contrib/libs/linuxvdso/original/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/linuxvdso/original/CMakeLists.txt +++ b/contrib/libs/linuxvdso/original/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt b/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt +++ b/contrib/libs/llvm12/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt b/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt +++ b/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/lzma/CMakeLists.txt b/contrib/libs/lzma/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/lzma/CMakeLists.txt +++ b/contrib/libs/lzma/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/nayuki_md5/CMakeLists.txt b/contrib/libs/nayuki_md5/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/libs/nayuki_md5/CMakeLists.txt +++ b/contrib/libs/nayuki_md5/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/pdqsort/CMakeLists.txt b/contrib/libs/pdqsort/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/pdqsort/CMakeLists.txt +++ b/contrib/libs/pdqsort/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/poco/Crypto/CMakeLists.txt b/contrib/libs/poco/Crypto/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/poco/Crypto/CMakeLists.txt +++ b/contrib/libs/poco/Crypto/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/poco/Foundation/CMakeLists.txt b/contrib/libs/poco/Foundation/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/poco/Foundation/CMakeLists.txt +++ b/contrib/libs/poco/Foundation/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/poco/JSON/CMakeLists.txt b/contrib/libs/poco/JSON/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/poco/JSON/CMakeLists.txt +++ b/contrib/libs/poco/JSON/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/poco/Net/CMakeLists.txt b/contrib/libs/poco/Net/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/poco/Net/CMakeLists.txt +++ b/contrib/libs/poco/Net/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt +++ b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/poco/Util/CMakeLists.txt b/contrib/libs/poco/Util/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/poco/Util/CMakeLists.txt +++ b/contrib/libs/poco/Util/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/poco/XML/CMakeLists.txt b/contrib/libs/poco/XML/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/poco/XML/CMakeLists.txt +++ b/contrib/libs/poco/XML/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/tcmalloc/CMakeLists.txt b/contrib/libs/tcmalloc/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/tcmalloc/CMakeLists.txt +++ b/contrib/libs/tcmalloc/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt b/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt +++ b/contrib/libs/tcmalloc/no_percpu_cache/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/restricted/aws/aws-c-common/CMakeLists.txt +++ b/contrib/restricted/aws/aws-c-common/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/restricted/aws/aws-c-io/CMakeLists.txt b/contrib/restricted/aws/aws-c-io/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/restricted/aws/aws-c-io/CMakeLists.txt +++ b/contrib/restricted/aws/aws-c-io/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/restricted/aws/s2n/CMakeLists.txt b/contrib/restricted/aws/s2n/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/restricted/aws/s2n/CMakeLists.txt +++ b/contrib/restricted/aws/s2n/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/restricted/boost/libs/chrono/CMakeLists.txt b/contrib/restricted/boost/libs/chrono/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/restricted/boost/libs/chrono/CMakeLists.txt +++ b/contrib/restricted/boost/libs/chrono/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/restricted/boost/libs/iostreams/CMakeLists.txt b/contrib/restricted/boost/libs/iostreams/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/restricted/boost/libs/iostreams/CMakeLists.txt +++ b/contrib/restricted/boost/libs/iostreams/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/restricted/boost/libs/program_options/CMakeLists.txt b/contrib/restricted/boost/libs/program_options/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/restricted/boost/libs/program_options/CMakeLists.txt +++ b/contrib/restricted/boost/libs/program_options/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/restricted/boost/libs/system/CMakeLists.txt b/contrib/restricted/boost/libs/system/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/restricted/boost/libs/system/CMakeLists.txt +++ b/contrib/restricted/boost/libs/system/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/restricted/boost/libs/thread/CMakeLists.txt b/contrib/restricted/boost/libs/thread/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/restricted/boost/libs/thread/CMakeLists.txt +++ b/contrib/restricted/boost/libs/thread/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/restricted/cityhash-1.0.2/CMakeLists.txt b/contrib/restricted/cityhash-1.0.2/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/restricted/cityhash-1.0.2/CMakeLists.txt +++ b/contrib/restricted/cityhash-1.0.2/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/restricted/dragonbox/CMakeLists.txt b/contrib/restricted/dragonbox/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/contrib/restricted/dragonbox/CMakeLists.txt +++ b/contrib/restricted/dragonbox/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/tools/protoc/bin/CMakeLists.txt b/contrib/tools/protoc/bin/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/tools/protoc/bin/CMakeLists.txt +++ b/contrib/tools/protoc/bin/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt +++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt +++ b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/library/cpp/actors/interconnect/CMakeLists.txt b/library/cpp/actors/interconnect/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/library/cpp/actors/interconnect/CMakeLists.txt +++ b/library/cpp/actors/interconnect/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/library/cpp/balloc/lib/CMakeLists.txt b/library/cpp/balloc/lib/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/library/cpp/balloc/lib/CMakeLists.txt +++ b/library/cpp/balloc/lib/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) 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 a681d385f3..fc7b1ee73c 100644 --- a/library/cpp/digest/old_crc/gencrc/CMakeLists.txt +++ b/library/cpp/digest/old_crc/gencrc/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/library/cpp/malloc/tcmalloc/CMakeLists.txt b/library/cpp/malloc/tcmalloc/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/library/cpp/malloc/tcmalloc/CMakeLists.txt +++ b/library/cpp/malloc/tcmalloc/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/tools/enum_parser/enum_parser/bin/CMakeLists.txt b/tools/enum_parser/enum_parser/bin/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/tools/enum_parser/enum_parser/bin/CMakeLists.txt +++ b/tools/enum_parser/enum_parser/bin/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/tools/rescompiler/bin/CMakeLists.txt b/tools/rescompiler/bin/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/tools/rescompiler/bin/CMakeLists.txt +++ b/tools/rescompiler/bin/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/util/CMakeLists.txt +++ b/util/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/apps/ydb/CMakeLists.txt b/ydb/apps/ydb/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/apps/ydb/CMakeLists.txt +++ b/ydb/apps/ydb/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/apps/ydbd/CMakeLists.txt b/ydb/apps/ydbd/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/apps/ydbd/CMakeLists.txt +++ b/ydb/apps/ydbd/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/actorlib_impl/ut/CMakeLists.txt b/ydb/core/actorlib_impl/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/actorlib_impl/ut/CMakeLists.txt +++ b/ydb/core/actorlib_impl/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/base/ut/CMakeLists.txt b/ydb/core/base/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/base/ut/CMakeLists.txt +++ b/ydb/core/base/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/backpressure/ut/CMakeLists.txt b/ydb/core/blobstorage/backpressure/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/backpressure/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/backpressure/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.txt b/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.txt +++ b/ydb/core/blobstorage/backpressure/ut_client/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/base/ut/CMakeLists.txt b/ydb/core/blobstorage/base/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/base/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/base/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/crypto/ut/CMakeLists.txt b/ydb/core/blobstorage/crypto/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/crypto/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/crypto/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/dsproxy/ut/CMakeLists.txt b/ydb/core/blobstorage/dsproxy/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/dsproxy/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/dsproxy/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.txt b/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.txt +++ b/ydb/core/blobstorage/dsproxy/ut_fat/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/groupinfo/ut/CMakeLists.txt b/ydb/core/blobstorage/groupinfo/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/groupinfo/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/groupinfo/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/incrhuge/ut/CMakeLists.txt b/ydb/core/blobstorage/incrhuge/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/incrhuge/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/incrhuge/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/nodewarden/node_warden_group.cpp b/ydb/core/blobstorage/nodewarden/node_warden_group.cpp index 32ce91af38..cd2072cbc7 100644 --- a/ydb/core/blobstorage/nodewarden/node_warden_group.cpp +++ b/ydb/core/blobstorage/nodewarden/node_warden_group.cpp @@ -97,6 +97,11 @@ namespace NKikimr::NStorage { // some basic consistency checks Y_VERIFY(!newGroup || (newGroup->GetGroupID() == groupId && newGroup->GetGroupGeneration() == generation)); + // log if from resolver + if (fromResolver) { + STLOG(PRI_NOTICE, BS_NODE, NW73, "ApplyGroupInfo from resolver", (GroupId, groupId), (GroupGeneration, generation)); + } + // obtain group record const auto [it, _] = Groups.try_emplace(groupId); TGroupRecord& group = it->second; diff --git a/ydb/core/blobstorage/nodewarden/ut/CMakeLists.txt b/ydb/core/blobstorage/nodewarden/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/nodewarden/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/nodewarden/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.txt b/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.txt +++ b/ydb/core/blobstorage/nodewarden/ut_sequence/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/pdisk/ut/CMakeLists.txt b/ydb/core/blobstorage/pdisk/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/pdisk/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/pdisk/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.txt b/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/storagepoolmon/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.txt +++ b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.txt +++ b/ydb/core/blobstorage/ut_blobstorage/ut_blob_depot/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.txt +++ b/ydb/core/blobstorage/ut_blobstorage/ut_donor/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.txt +++ b/ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.txt +++ b/ydb/core/blobstorage/ut_blobstorage/ut_osiris/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.txt +++ b/ydb/core/blobstorage/ut_blobstorage/ut_replication/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.txt +++ b/ydb/core/blobstorage/ut_blobstorage/ut_scrub/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/ut_group/CMakeLists.txt b/ydb/core/blobstorage/ut_group/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/ut_group/CMakeLists.txt +++ b/ydb/core/blobstorage/ut_group/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.txt b/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.txt +++ b/ydb/core/blobstorage/ut_mirror3of4/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/CMakeLists.txt b/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/CMakeLists.txt +++ b/ydb/core/blobstorage/ut_pdiskfit/pdiskfit/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/ut_pdiskfit/ut/CMakeLists.txt b/ydb/core/blobstorage/ut_pdiskfit/ut/CMakeLists.txt index c031ddb850..e8c98bfd99 100644 --- a/ydb/core/blobstorage/ut_pdiskfit/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/ut_pdiskfit/ut/CMakeLists.txt @@ -6,6 +6,6 @@ # original buildsystem will not be accepted. -if (UNIX) +if (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/ut_vdisk/CMakeLists.txt b/ydb/core/blobstorage/ut_vdisk/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/ut_vdisk/CMakeLists.txt +++ b/ydb/core/blobstorage/ut_vdisk/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/ut_vdisk2/CMakeLists.txt b/ydb/core/blobstorage/ut_vdisk2/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/ut_vdisk2/CMakeLists.txt +++ b/ydb/core/blobstorage/ut_vdisk2/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/anubis_osiris/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/common/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/defrag/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/huge/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/hulldb/barriers/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/hulldb/base/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/hulldb/compstrat/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/hulldb/generic/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/hulldb/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/hulldb/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/hullop/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/ingress/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/query/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/repl/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/skeleton/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/syncer/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.txt +++ b/ydb/core/blobstorage/vdisk/synclog/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/client/metadata/ut/CMakeLists.txt b/ydb/core/client/metadata/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/client/metadata/ut/CMakeLists.txt +++ b/ydb/core/client/metadata/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/client/minikql_compile/ut/CMakeLists.txt b/ydb/core/client/minikql_compile/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/client/minikql_compile/ut/CMakeLists.txt +++ b/ydb/core/client/minikql_compile/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/client/minikql_result_lib/ut/CMakeLists.txt b/ydb/core/client/minikql_result_lib/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/client/minikql_result_lib/ut/CMakeLists.txt +++ b/ydb/core/client/minikql_result_lib/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/client/server/ut/CMakeLists.txt b/ydb/core/client/server/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/client/server/ut/CMakeLists.txt +++ b/ydb/core/client/server/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/client/ut/CMakeLists.txt b/ydb/core/client/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/client/ut/CMakeLists.txt +++ b/ydb/core/client/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/cms/console/ut/CMakeLists.txt b/ydb/core/cms/console/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/cms/console/ut/CMakeLists.txt +++ b/ydb/core/cms/console/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/cms/console/validators/ut/CMakeLists.txt b/ydb/core/cms/console/validators/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/cms/console/validators/ut/CMakeLists.txt +++ b/ydb/core/cms/console/validators/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/cms/ut/CMakeLists.txt b/ydb/core/cms/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/cms/ut/CMakeLists.txt +++ b/ydb/core/cms/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/cms/ut_sentinel/CMakeLists.txt b/ydb/core/cms/ut_sentinel/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/cms/ut_sentinel/CMakeLists.txt +++ b/ydb/core/cms/ut_sentinel/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/control/ut/CMakeLists.txt b/ydb/core/control/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/control/ut/CMakeLists.txt +++ b/ydb/core/control/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/driver_lib/run/ut/CMakeLists.txt b/ydb/core/driver_lib/run/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/driver_lib/run/ut/CMakeLists.txt +++ b/ydb/core/driver_lib/run/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/engine/ut/CMakeLists.txt b/ydb/core/engine/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/engine/ut/CMakeLists.txt +++ b/ydb/core/engine/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/erasure/ut/CMakeLists.txt b/ydb/core/erasure/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/erasure/ut/CMakeLists.txt +++ b/ydb/core/erasure/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/erasure/ut_perf/CMakeLists.txt b/ydb/core/erasure/ut_perf/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/erasure/ut_perf/CMakeLists.txt +++ b/ydb/core/erasure/ut_perf/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/erasure/ut_rope/CMakeLists.txt b/ydb/core/erasure/ut_rope/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/erasure/ut_rope/CMakeLists.txt +++ b/ydb/core/erasure/ut_rope/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/formats/ut/CMakeLists.txt b/ydb/core/formats/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/formats/ut/CMakeLists.txt +++ b/ydb/core/formats/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/grpc_services/ut/CMakeLists.txt b/ydb/core/grpc_services/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/grpc_services/ut/CMakeLists.txt +++ b/ydb/core/grpc_services/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/grpc_streaming/ut/CMakeLists.txt b/ydb/core/grpc_streaming/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/grpc_streaming/ut/CMakeLists.txt +++ b/ydb/core/grpc_streaming/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/health_check/ut/CMakeLists.txt b/ydb/core/health_check/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/health_check/ut/CMakeLists.txt +++ b/ydb/core/health_check/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/kesus/proxy/ut/CMakeLists.txt b/ydb/core/kesus/proxy/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/kesus/proxy/ut/CMakeLists.txt +++ b/ydb/core/kesus/proxy/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.txt b/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.txt +++ b/ydb/core/kesus/tablet/quoter_performance_test/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/kesus/tablet/ut/CMakeLists.txt b/ydb/core/kesus/tablet/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/kesus/tablet/ut/CMakeLists.txt +++ b/ydb/core/kesus/tablet/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/keyvalue/ut/CMakeLists.txt b/ydb/core/keyvalue/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/keyvalue/ut/CMakeLists.txt +++ b/ydb/core/keyvalue/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/kqp/executer/ut/CMakeLists.txt b/ydb/core/kqp/executer/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/kqp/executer/ut/CMakeLists.txt +++ b/ydb/core/kqp/executer/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/kqp/node/ut/CMakeLists.txt b/ydb/core/kqp/node/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/kqp/node/ut/CMakeLists.txt +++ b/ydb/core/kqp/node/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/kqp/provider/ut/CMakeLists.txt b/ydb/core/kqp/provider/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/kqp/provider/ut/CMakeLists.txt +++ b/ydb/core/kqp/provider/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/kqp/proxy/ut/CMakeLists.txt b/ydb/core/kqp/proxy/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/kqp/proxy/ut/CMakeLists.txt +++ b/ydb/core/kqp/proxy/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/kqp/rm/ut/CMakeLists.txt b/ydb/core/kqp/rm/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/kqp/rm/ut/CMakeLists.txt +++ b/ydb/core/kqp/rm/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/kqp/runtime/ut/CMakeLists.txt b/ydb/core/kqp/runtime/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/kqp/runtime/ut/CMakeLists.txt +++ b/ydb/core/kqp/runtime/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/kqp/ut/CMakeLists.txt b/ydb/core/kqp/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/kqp/ut/CMakeLists.txt +++ b/ydb/core/kqp/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/kqp/ut/fat/CMakeLists.txt b/ydb/core/kqp/ut/fat/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/kqp/ut/fat/CMakeLists.txt +++ b/ydb/core/kqp/ut/fat/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/metering/ut/CMakeLists.txt b/ydb/core/metering/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/metering/ut/CMakeLists.txt +++ b/ydb/core/metering/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/mind/address_classification/ut/CMakeLists.txt b/ydb/core/mind/address_classification/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/mind/address_classification/ut/CMakeLists.txt +++ b/ydb/core/mind/address_classification/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/mind/bscontroller/ut/CMakeLists.txt b/ydb/core/mind/bscontroller/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/mind/bscontroller/ut/CMakeLists.txt +++ b/ydb/core/mind/bscontroller/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.txt b/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.txt +++ b/ydb/core/mind/bscontroller/ut_bscontroller/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.txt b/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.txt +++ b/ydb/core/mind/bscontroller/ut_selfheal/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/mind/hive/ut/CMakeLists.txt b/ydb/core/mind/hive/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/mind/hive/ut/CMakeLists.txt +++ b/ydb/core/mind/hive/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/mind/ut/CMakeLists.txt b/ydb/core/mind/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/mind/ut/CMakeLists.txt +++ b/ydb/core/mind/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/mind/ut_fat/CMakeLists.txt b/ydb/core/mind/ut_fat/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/mind/ut_fat/CMakeLists.txt +++ b/ydb/core/mind/ut_fat/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/persqueue/ut/CMakeLists.txt b/ydb/core/persqueue/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/persqueue/ut/CMakeLists.txt +++ b/ydb/core/persqueue/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/persqueue/ut_slow/CMakeLists.txt b/ydb/core/persqueue/ut_slow/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/persqueue/ut_slow/CMakeLists.txt +++ b/ydb/core/persqueue/ut_slow/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.txt b/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.txt +++ b/ydb/core/quoter/quoter_service_bandwidth_test/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/quoter/ut/CMakeLists.txt b/ydb/core/quoter/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/quoter/ut/CMakeLists.txt +++ b/ydb/core/quoter/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/scheme/ut/CMakeLists.txt b/ydb/core/scheme/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/scheme/ut/CMakeLists.txt +++ b/ydb/core/scheme/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/security/ut/CMakeLists.txt b/ydb/core/security/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/security/ut/CMakeLists.txt +++ b/ydb/core/security/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/sys_view/partition_stats/ut/CMakeLists.txt b/ydb/core/sys_view/partition_stats/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/sys_view/partition_stats/ut/CMakeLists.txt +++ b/ydb/core/sys_view/partition_stats/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/sys_view/query_stats/ut/CMakeLists.txt b/ydb/core/sys_view/query_stats/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/sys_view/query_stats/ut/CMakeLists.txt +++ b/ydb/core/sys_view/query_stats/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/sys_view/service/ut/CMakeLists.txt b/ydb/core/sys_view/service/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/sys_view/service/ut/CMakeLists.txt +++ b/ydb/core/sys_view/service/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/sys_view/ut_kqp/CMakeLists.txt b/ydb/core/sys_view/ut_kqp/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/sys_view/ut_kqp/CMakeLists.txt +++ b/ydb/core/sys_view/ut_kqp/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tablet/ut/CMakeLists.txt b/ydb/core/tablet/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tablet/ut/CMakeLists.txt +++ b/ydb/core/tablet/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tablet_flat/test/tool/perf/CMakeLists.txt b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tablet_flat/test/tool/perf/CMakeLists.txt +++ b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tablet_flat/test/tool/surg/CMakeLists.txt b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tablet_flat/test/tool/surg/CMakeLists.txt +++ b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tablet_flat/ut/CMakeLists.txt b/ydb/core/tablet_flat/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tablet_flat/ut/CMakeLists.txt +++ b/ydb/core/tablet_flat/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tablet_flat/ut_large/CMakeLists.txt b/ydb/core/tablet_flat/ut_large/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tablet_flat/ut_large/CMakeLists.txt +++ b/ydb/core/tablet_flat/ut_large/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/testlib/actors/ut/CMakeLists.txt b/ydb/core/testlib/actors/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/testlib/actors/ut/CMakeLists.txt +++ b/ydb/core/testlib/actors/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/balance_coverage/ut/CMakeLists.txt b/ydb/core/tx/balance_coverage/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/balance_coverage/ut/CMakeLists.txt +++ b/ydb/core/tx/balance_coverage/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/columnshard/engines/ut/CMakeLists.txt b/ydb/core/tx/columnshard/engines/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/columnshard/engines/ut/CMakeLists.txt +++ b/ydb/core/tx/columnshard/engines/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/columnshard/ut/CMakeLists.txt b/ydb/core/tx/columnshard/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/columnshard/ut/CMakeLists.txt +++ b/ydb/core/tx/columnshard/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/coordinator/ut/CMakeLists.txt b/ydb/core/tx/coordinator/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/coordinator/ut/CMakeLists.txt +++ b/ydb/core/tx/coordinator/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.txt b/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_background_compaction/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_build_index/CMakeLists.txt b/ydb/core/tx/datashard/ut_build_index/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_build_index/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_build_index/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_change_collector/CMakeLists.txt b/ydb/core/tx/datashard/ut_change_collector/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_change_collector/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_change_collector/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.txt b/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_change_exchange/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_compaction/CMakeLists.txt b/ydb/core/tx/datashard/ut_compaction/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_compaction/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_compaction/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.txt b/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_erase_rows/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_followers/CMakeLists.txt b/ydb/core/tx/datashard/ut_followers/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_followers/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_followers/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_init/CMakeLists.txt b/ydb/core/tx/datashard/ut_init/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_init/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_init/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_keys/CMakeLists.txt b/ydb/core/tx/datashard/ut_keys/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_keys/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_keys/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_kqp/CMakeLists.txt b/ydb/core/tx/datashard/ut_kqp/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_kqp/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_kqp/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.txt b/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_kqp_errors/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.txt b/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_kqp_scan/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_locks/CMakeLists.txt b/ydb/core/tx/datashard/ut_locks/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_locks/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_locks/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_minikql/CMakeLists.txt b/ydb/core/tx/datashard/ut_minikql/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_minikql/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_minikql/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_minstep/CMakeLists.txt b/ydb/core/tx/datashard/ut_minstep/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_minstep/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_minstep/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_order/CMakeLists.txt b/ydb/core/tx/datashard/ut_order/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_order/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_order/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.txt b/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_range_avl_tree/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_range_ops/CMakeLists.txt b/ydb/core/tx/datashard/ut_range_ops/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_range_ops/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_range_ops/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_range_treap/CMakeLists.txt b/ydb/core/tx/datashard/ut_range_treap/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_range_treap/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_range_treap/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.txt b/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_read_iterator/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_read_table/CMakeLists.txt b/ydb/core/tx/datashard/ut_read_table/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_read_table/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_read_table/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_reassign/CMakeLists.txt b/ydb/core/tx/datashard/ut_reassign/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_reassign/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_reassign/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_replication/CMakeLists.txt b/ydb/core/tx/datashard/ut_replication/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_replication/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_replication/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_rs/CMakeLists.txt b/ydb/core/tx/datashard/ut_rs/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_rs/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_rs/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_snapshot/CMakeLists.txt b/ydb/core/tx/datashard/ut_snapshot/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_snapshot/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_snapshot/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_stats/CMakeLists.txt b/ydb/core/tx/datashard/ut_stats/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_stats/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_stats/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.txt b/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.txt +++ b/ydb/core/tx/datashard/ut_upload_rows/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/long_tx_service/public/ut/CMakeLists.txt b/ydb/core/tx/long_tx_service/public/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/long_tx_service/public/ut/CMakeLists.txt +++ b/ydb/core/tx/long_tx_service/public/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/long_tx_service/ut/CMakeLists.txt b/ydb/core/tx/long_tx_service/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/long_tx_service/ut/CMakeLists.txt +++ b/ydb/core/tx/long_tx_service/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.txt b/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.txt +++ b/ydb/core/tx/replication/ydb_proxy/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/scheme_board/ut_cache/CMakeLists.txt b/ydb/core/tx/scheme_board/ut_cache/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/scheme_board/ut_cache/CMakeLists.txt +++ b/ydb/core/tx/scheme_board/ut_cache/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.txt b/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.txt +++ b/ydb/core/tx/scheme_board/ut_double_indexed/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.txt b/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.txt +++ b/ydb/core/tx/scheme_board/ut_monitoring/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/scheme_board/ut_populator/CMakeLists.txt b/ydb/core/tx/scheme_board/ut_populator/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/scheme_board/ut_populator/CMakeLists.txt +++ b/ydb/core/tx/scheme_board/ut_populator/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/scheme_board/ut_replica/CMakeLists.txt b/ydb/core/tx/scheme_board/ut_replica/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/scheme_board/ut_replica/CMakeLists.txt +++ b/ydb/core/tx/scheme_board/ut_replica/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.txt b/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.txt +++ b/ydb/core/tx/scheme_board/ut_subscriber/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_async_index/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_backup/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_backup/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_backup/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_backup/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_base/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_base/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_base/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_base/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_base_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_bsvolume/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_bsvolume_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_cdc_stream/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_cdc_stream_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_compaction/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_export/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_export/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_export/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_export/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_export_reboots_s3/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_extsubdomain/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_extsubdomain_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_filestore_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_index_build/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_index_build_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_login/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_login/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_login/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_login/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_move/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_move/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_move/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_move/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_move_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_olap/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_olap/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_olap/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_olap/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_olap_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_pq/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_pq/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_pq/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_pq/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_pq_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_replication/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_replication/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_replication/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_replication/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_replication_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_restore/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_restore/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_restore/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_restore/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_rtmr/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_rtmr_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_ru_calculator/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_sequence/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_sequence_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_serverless/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_split_merge/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_split_merge_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_stats/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_stats/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_stats/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_stats/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_subdomain/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_subdomain_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_ttl/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_user_attributes/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.txt b/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.txt +++ b/ydb/core/tx/schemeshard/ut_user_attributes_reboots/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/sequenceproxy/ut/CMakeLists.txt b/ydb/core/tx/sequenceproxy/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/sequenceproxy/ut/CMakeLists.txt +++ b/ydb/core/tx/sequenceproxy/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/sequenceshard/public/ut/CMakeLists.txt b/ydb/core/tx/sequenceshard/public/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/sequenceshard/public/ut/CMakeLists.txt +++ b/ydb/core/tx/sequenceshard/public/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/sequenceshard/ut/CMakeLists.txt b/ydb/core/tx/sequenceshard/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/sequenceshard/ut/CMakeLists.txt +++ b/ydb/core/tx/sequenceshard/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/time_cast/ut/CMakeLists.txt b/ydb/core/tx/time_cast/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/time_cast/ut/CMakeLists.txt +++ b/ydb/core/tx/time_cast/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/tx_allocator/ut/CMakeLists.txt b/ydb/core/tx/tx_allocator/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/tx_allocator/ut/CMakeLists.txt +++ b/ydb/core/tx/tx_allocator/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/tx_allocator_client/ut/CMakeLists.txt b/ydb/core/tx/tx_allocator_client/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/tx_allocator_client/ut/CMakeLists.txt +++ b/ydb/core/tx/tx_allocator_client/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.txt b/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.txt +++ b/ydb/core/tx/tx_proxy/ut_base_tenant/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.txt b/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.txt +++ b/ydb/core/tx/tx_proxy/ut_encrypted_storage/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.txt b/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.txt +++ b/ydb/core/tx/tx_proxy/ut_ext_tenant/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.txt b/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.txt +++ b/ydb/core/tx/tx_proxy/ut_storage_tenant/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/util/btree_benchmark/CMakeLists.txt b/ydb/core/util/btree_benchmark/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/util/btree_benchmark/CMakeLists.txt +++ b/ydb/core/util/btree_benchmark/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/util/ut/CMakeLists.txt b/ydb/core/util/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/util/ut/CMakeLists.txt +++ b/ydb/core/util/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/viewer/ut/CMakeLists.txt b/ydb/core/viewer/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/viewer/ut/CMakeLists.txt +++ b/ydb/core/viewer/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/wrappers/ut/CMakeLists.txt b/ydb/core/wrappers/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/wrappers/ut/CMakeLists.txt +++ b/ydb/core/wrappers/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/ydb_convert/ut/CMakeLists.txt b/ydb/core/ydb_convert/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/ydb_convert/ut/CMakeLists.txt +++ b/ydb/core/ydb_convert/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/ymq/actor/ut/CMakeLists.txt b/ydb/core/ymq/actor/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/ymq/actor/ut/CMakeLists.txt +++ b/ydb/core/ymq/actor/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/ymq/actor/yc_search_ut/CMakeLists.txt b/ydb/core/ymq/actor/yc_search_ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/ymq/actor/yc_search_ut/CMakeLists.txt +++ b/ydb/core/ymq/actor/yc_search_ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/ymq/base/ut/CMakeLists.txt b/ydb/core/ymq/base/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/ymq/base/ut/CMakeLists.txt +++ b/ydb/core/ymq/base/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/ymq/client/bin/CMakeLists.txt b/ydb/core/ymq/client/bin/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/ymq/client/bin/CMakeLists.txt +++ b/ydb/core/ymq/client/bin/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/ymq/http/ut/CMakeLists.txt b/ydb/core/ymq/http/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/ymq/http/ut/CMakeLists.txt +++ b/ydb/core/ymq/http/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/ymq/ut/CMakeLists.txt b/ydb/core/ymq/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/ymq/ut/CMakeLists.txt +++ b/ydb/core/ymq/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/yq/libs/checkpointing/ut/CMakeLists.txt b/ydb/core/yq/libs/checkpointing/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/yq/libs/checkpointing/ut/CMakeLists.txt +++ b/ydb/core/yq/libs/checkpointing/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/yq/libs/common/ut/CMakeLists.txt b/ydb/core/yq/libs/common/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/yq/libs/common/ut/CMakeLists.txt +++ b/ydb/core/yq/libs/common/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.txt b/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.txt +++ b/ydb/core/yq/libs/control_plane_proxy/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/yq/libs/hmac/ut/CMakeLists.txt b/ydb/core/yq/libs/hmac/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/yq/libs/hmac/ut/CMakeLists.txt +++ b/ydb/core/yq/libs/hmac/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/yq/libs/result_formatter/ut/CMakeLists.txt b/ydb/core/yq/libs/result_formatter/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/yq/libs/result_formatter/ut/CMakeLists.txt +++ b/ydb/core/yq/libs/result_formatter/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/yq/libs/signer/ut/CMakeLists.txt b/ydb/core/yq/libs/signer/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/yq/libs/signer/ut/CMakeLists.txt +++ b/ydb/core/yq/libs/signer/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/core/yq/libs/test_connection/ut/CMakeLists.txt b/ydb/core/yq/libs/test_connection/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/core/yq/libs/test_connection/ut/CMakeLists.txt +++ b/ydb/core/yq/libs/test_connection/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/aclib/ut/CMakeLists.txt b/ydb/library/aclib/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/aclib/ut/CMakeLists.txt +++ b/ydb/library/aclib/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/backup/ut/CMakeLists.txt b/ydb/library/backup/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/backup/ut/CMakeLists.txt +++ b/ydb/library/backup/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/binary_json/ut/CMakeLists.txt b/ydb/library/binary_json/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/binary_json/ut/CMakeLists.txt +++ b/ydb/library/binary_json/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/dynumber/ut/CMakeLists.txt b/ydb/library/dynumber/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/dynumber/ut/CMakeLists.txt +++ b/ydb/library/dynumber/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/http_proxy/authorization/ut/CMakeLists.txt b/ydb/library/http_proxy/authorization/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/http_proxy/authorization/ut/CMakeLists.txt +++ b/ydb/library/http_proxy/authorization/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/keys/ut/CMakeLists.txt b/ydb/library/keys/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/keys/ut/CMakeLists.txt +++ b/ydb/library/keys/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/login/ut/CMakeLists.txt b/ydb/library/login/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/login/ut/CMakeLists.txt +++ b/ydb/library/login/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/mkql_proto/ut/CMakeLists.txt b/ydb/library/mkql_proto/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/mkql_proto/ut/CMakeLists.txt +++ b/ydb/library/mkql_proto/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/naming_conventions/ut/CMakeLists.txt b/ydb/library/naming_conventions/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/naming_conventions/ut/CMakeLists.txt +++ b/ydb/library/naming_conventions/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/pdisk_io/CMakeLists.txt b/ydb/library/pdisk_io/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/pdisk_io/CMakeLists.txt +++ b/ydb/library/pdisk_io/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/persqueue/topic_parser/ut/CMakeLists.txt b/ydb/library/persqueue/topic_parser/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/persqueue/topic_parser/ut/CMakeLists.txt +++ b/ydb/library/persqueue/topic_parser/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/protobuf_printer/ut/CMakeLists.txt b/ydb/library/protobuf_printer/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/protobuf_printer/ut/CMakeLists.txt +++ b/ydb/library/protobuf_printer/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/schlab/mon/test/CMakeLists.txt b/ydb/library/schlab/mon/test/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/schlab/mon/test/CMakeLists.txt +++ b/ydb/library/schlab/mon/test/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/schlab/ut/CMakeLists.txt b/ydb/library/schlab/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/schlab/ut/CMakeLists.txt +++ b/ydb/library/schlab/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/security/ut/CMakeLists.txt b/ydb/library/security/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/security/ut/CMakeLists.txt +++ b/ydb/library/security/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/ast/ut/CMakeLists.txt b/ydb/library/yql/ast/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/ast/ut/CMakeLists.txt +++ b/ydb/library/yql/ast/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/core/file_storage/ut/CMakeLists.txt b/ydb/library/yql/core/file_storage/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/core/file_storage/ut/CMakeLists.txt +++ b/ydb/library/yql/core/file_storage/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/core/issue/ut/CMakeLists.txt b/ydb/library/yql/core/issue/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/core/issue/ut/CMakeLists.txt +++ b/ydb/library/yql/core/issue/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/dq/actors/compute/ut/CMakeLists.txt b/ydb/library/yql/dq/actors/compute/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/dq/actors/compute/ut/CMakeLists.txt +++ b/ydb/library/yql/dq/actors/compute/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/dq/runtime/ut/CMakeLists.txt b/ydb/library/yql/dq/runtime/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/dq/runtime/ut/CMakeLists.txt +++ b/ydb/library/yql/dq/runtime/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/dq/state/ut/CMakeLists.txt b/ydb/library/yql/dq/state/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/dq/state/ut/CMakeLists.txt +++ b/ydb/library/yql/dq/state/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.txt b/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.txt +++ b/ydb/library/yql/minikql/benchmark/pack_num/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/minikql/codegen/CMakeLists.txt b/ydb/library/yql/minikql/codegen/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/minikql/codegen/CMakeLists.txt +++ b/ydb/library/yql/minikql/codegen/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.txt b/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.txt +++ b/ydb/library/yql/minikql/jsonpath/benchmark/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/minikql/perf/alloc/CMakeLists.txt b/ydb/library/yql/minikql/perf/alloc/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/minikql/perf/alloc/CMakeLists.txt +++ b/ydb/library/yql/minikql/perf/alloc/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/minikql/perf/mt_param/CMakeLists.txt b/ydb/library/yql/minikql/perf/mt_param/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/minikql/perf/mt_param/CMakeLists.txt +++ b/ydb/library/yql/minikql/perf/mt_param/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/minikql/perf/packer/CMakeLists.txt b/ydb/library/yql/minikql/perf/packer/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/minikql/perf/packer/CMakeLists.txt +++ b/ydb/library/yql/minikql/perf/packer/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/minikql/perf/param/CMakeLists.txt b/ydb/library/yql/minikql/perf/param/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/minikql/perf/param/CMakeLists.txt +++ b/ydb/library/yql/minikql/perf/param/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/minikql/perf/presort/CMakeLists.txt b/ydb/library/yql/minikql/perf/presort/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/minikql/perf/presort/CMakeLists.txt +++ b/ydb/library/yql/minikql/perf/presort/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/minikql/ut/CMakeLists.txt b/ydb/library/yql/minikql/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/minikql/ut/CMakeLists.txt +++ b/ydb/library/yql/minikql/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/parser/lexer_common/ut/CMakeLists.txt b/ydb/library/yql/parser/lexer_common/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/parser/lexer_common/ut/CMakeLists.txt +++ b/ydb/library/yql/parser/lexer_common/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.txt b/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.txt +++ b/ydb/library/yql/parser/pg_catalog/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/providers/common/codec/ut/CMakeLists.txt b/ydb/library/yql/providers/common/codec/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/providers/common/codec/ut/CMakeLists.txt +++ b/ydb/library/yql/providers/common/codec/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.txt b/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.txt +++ b/ydb/library/yql/providers/common/structured_token/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/providers/s3/actors/CMakeLists.txt b/ydb/library/yql/providers/s3/actors/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/providers/s3/actors/CMakeLists.txt +++ b/ydb/library/yql/providers/s3/actors/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/providers/s3/compressors/CMakeLists.txt b/ydb/library/yql/providers/s3/compressors/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/providers/s3/compressors/CMakeLists.txt +++ b/ydb/library/yql/providers/s3/compressors/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.txt b/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.txt +++ b/ydb/library/yql/providers/s3/path_generator/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/public/decimal/ut/CMakeLists.txt b/ydb/library/yql/public/decimal/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/public/decimal/ut/CMakeLists.txt +++ b/ydb/library/yql/public/decimal/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/public/issue/ut/CMakeLists.txt b/ydb/library/yql/public/issue/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/public/issue/ut/CMakeLists.txt +++ b/ydb/library/yql/public/issue/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/public/udf/ut/CMakeLists.txt b/ydb/library/yql/public/udf/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/public/udf/ut/CMakeLists.txt +++ b/ydb/library/yql/public/udf/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/sql/v1/perf/CMakeLists.txt b/ydb/library/yql/sql/v1/perf/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/sql/v1/perf/CMakeLists.txt +++ b/ydb/library/yql/sql/v1/perf/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.txt b/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.txt +++ b/ydb/library/yql/udfs/common/clickhouse/client/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/udfs/common/hyperscan/CMakeLists.txt b/ydb/library/yql/udfs/common/hyperscan/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/udfs/common/hyperscan/CMakeLists.txt +++ b/ydb/library/yql/udfs/common/hyperscan/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/udfs/common/stat/ut/CMakeLists.txt b/ydb/library/yql/udfs/common/stat/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/udfs/common/stat/ut/CMakeLists.txt +++ b/ydb/library/yql/udfs/common/stat/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.txt b/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.txt +++ b/ydb/library/yql/udfs/common/topfreq/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/utils/actors/ut/CMakeLists.txt b/ydb/library/yql/utils/actors/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/utils/actors/ut/CMakeLists.txt +++ b/ydb/library/yql/utils/actors/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/utils/failure_injector/ut/CMakeLists.txt b/ydb/library/yql/utils/failure_injector/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/utils/failure_injector/ut/CMakeLists.txt +++ b/ydb/library/yql/utils/failure_injector/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/utils/log/ut/CMakeLists.txt b/ydb/library/yql/utils/log/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/utils/log/ut/CMakeLists.txt +++ b/ydb/library/yql/utils/log/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/library/yql/utils/ut/CMakeLists.txt b/ydb/library/yql/utils/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/library/yql/utils/ut/CMakeLists.txt +++ b/ydb/library/yql/utils/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/lib/deprecated/kicli/ut/CMakeLists.txt b/ydb/public/lib/deprecated/kicli/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/lib/deprecated/kicli/ut/CMakeLists.txt +++ b/ydb/public/lib/deprecated/kicli/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/lib/idx_test/ut/CMakeLists.txt b/ydb/public/lib/idx_test/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/lib/idx_test/ut/CMakeLists.txt +++ b/ydb/public/lib/idx_test/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/lib/json_value/ut/CMakeLists.txt b/ydb/public/lib/json_value/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/lib/json_value/ut/CMakeLists.txt +++ b/ydb/public/lib/json_value/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/lib/operation_id/ut/CMakeLists.txt b/ydb/public/lib/operation_id/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/lib/operation_id/ut/CMakeLists.txt +++ b/ydb/public/lib/operation_id/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/lib/validation/CMakeLists.txt b/ydb/public/lib/validation/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/lib/validation/CMakeLists.txt +++ b/ydb/public/lib/validation/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/lib/validation/ut/CMakeLists.txt b/ydb/public/lib/validation/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/lib/validation/ut/CMakeLists.txt +++ b/ydb/public/lib/validation/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/lib/ydb_cli/common/ut/CMakeLists.txt b/ydb/public/lib/ydb_cli/common/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/lib/ydb_cli/common/ut/CMakeLists.txt +++ b/ydb/public/lib/ydb_cli/common/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.txt +++ b/ydb/public/sdk/cpp/client/draft/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.txt +++ b/ydb/public/sdk/cpp/client/extensions/discovery_mutator/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.txt +++ b/ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.txt +++ b/ydb/public/sdk/cpp/client/ydb_coordination/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.txt +++ b/ydb/public/sdk/cpp/client/ydb_driver/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.txt +++ b/ydb/public/sdk/cpp/client/ydb_params/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.txt +++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt +++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.txt +++ b/ydb/public/sdk/cpp/client/ydb_result/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.txt b/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.txt +++ b/ydb/public/sdk/cpp/client/ydb_value/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.txt b/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.txt +++ b/ydb/public/sdk/cpp/examples/basic_example/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.txt b/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.txt +++ b/ydb/public/sdk/cpp/examples/bulk_upsert_simple/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/examples/pagination/CMakeLists.txt b/ydb/public/sdk/cpp/examples/pagination/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/examples/pagination/CMakeLists.txt +++ b/ydb/public/sdk/cpp/examples/pagination/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.txt b/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.txt +++ b/ydb/public/sdk/cpp/examples/secondary_index/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.txt b/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.txt +++ b/ydb/public/sdk/cpp/examples/secondary_index_builtin/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/public/sdk/cpp/examples/ttl/CMakeLists.txt b/ydb/public/sdk/cpp/examples/ttl/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/public/sdk/cpp/examples/ttl/CMakeLists.txt +++ b/ydb/public/sdk/cpp/examples/ttl/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/services/cms/ut/CMakeLists.txt b/ydb/services/cms/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/services/cms/ut/CMakeLists.txt +++ b/ydb/services/cms/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/services/datastreams/ut/CMakeLists.txt b/ydb/services/datastreams/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/services/datastreams/ut/CMakeLists.txt +++ b/ydb/services/datastreams/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.txt b/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.txt +++ b/ydb/services/persqueue_cluster_discovery/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/services/persqueue_v1/ut/CMakeLists.txt b/ydb/services/persqueue_v1/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/services/persqueue_v1/ut/CMakeLists.txt +++ b/ydb/services/persqueue_v1/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.txt b/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.txt +++ b/ydb/services/persqueue_v1/ut/new_schemecache_ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/services/rate_limiter/ut/CMakeLists.txt b/ydb/services/rate_limiter/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/services/rate_limiter/ut/CMakeLists.txt +++ b/ydb/services/rate_limiter/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/services/ydb/index_ut/CMakeLists.txt b/ydb/services/ydb/index_ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/services/ydb/index_ut/CMakeLists.txt +++ b/ydb/services/ydb/index_ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.txt b/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.txt +++ b/ydb/services/ydb/sdk_credprovider_ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/services/ydb/ut/CMakeLists.txt b/ydb/services/ydb/ut/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/services/ydb/ut/CMakeLists.txt +++ b/ydb/services/ydb/ut/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() diff --git a/ydb/services/yq/ut_integration/CMakeLists.txt b/ydb/services/yq/ut_integration/CMakeLists.txt index a681d385f3..fc7b1ee73c 100644 --- a/ydb/services/yq/ut_integration/CMakeLists.txt +++ b/ydb/services/yq/ut_integration/CMakeLists.txt @@ -8,6 +8,6 @@ if (APPLE) include(CMakeLists.darwin.txt) -elseif (UNIX) +elseif (UNIX AND NOT APPLE) include(CMakeLists.linux.txt) endif() |