diff options
author | Alexander Smirnov <alex@ydb.tech> | 2023-06-22 16:52:19 +0000 |
---|---|---|
committer | Alexander Smirnov <alex@ydb.tech> | 2023-06-22 16:52:19 +0000 |
commit | f001387a4d827160ddbe7123079f498ba8790747 (patch) | |
tree | 647342c8d70103ee58dbf391586ac495ee081755 | |
parent | 2e212624fe5240e6b6c38619e12136353b2b960c (diff) | |
download | ydb-get_cmakelists2.tar.gz |
70 files changed, 8 insertions, 418 deletions
diff --git a/CMakeLists.darwin-x86_64.txt b/CMakeLists.darwin-x86_64.txt index fa276972cd1..40456885637 100644 --- a/CMakeLists.darwin-x86_64.txt +++ b/CMakeLists.darwin-x86_64.txt @@ -6,9 +6,9 @@ # original buildsystem will not be accepted. -add_subdirectory(tools) +add_subdirectory(ydb) add_subdirectory(contrib) add_subdirectory(util) add_subdirectory(library) -add_subdirectory(ydb) +add_subdirectory(tools) add_subdirectory(certs) diff --git a/CMakeLists.linux-aarch64.txt b/CMakeLists.linux-aarch64.txt index fa276972cd1..40456885637 100644 --- a/CMakeLists.linux-aarch64.txt +++ b/CMakeLists.linux-aarch64.txt @@ -6,9 +6,9 @@ # original buildsystem will not be accepted. -add_subdirectory(tools) +add_subdirectory(ydb) add_subdirectory(contrib) add_subdirectory(util) add_subdirectory(library) -add_subdirectory(ydb) +add_subdirectory(tools) add_subdirectory(certs) diff --git a/CMakeLists.linux-x86_64.txt b/CMakeLists.linux-x86_64.txt index fa276972cd1..40456885637 100644 --- a/CMakeLists.linux-x86_64.txt +++ b/CMakeLists.linux-x86_64.txt @@ -6,9 +6,9 @@ # original buildsystem will not be accepted. -add_subdirectory(tools) +add_subdirectory(ydb) add_subdirectory(contrib) add_subdirectory(util) add_subdirectory(library) -add_subdirectory(ydb) +add_subdirectory(tools) add_subdirectory(certs) diff --git a/CMakeLists.windows-x86_64.txt b/CMakeLists.windows-x86_64.txt index fa276972cd1..40456885637 100644 --- a/CMakeLists.windows-x86_64.txt +++ b/CMakeLists.windows-x86_64.txt @@ -6,9 +6,9 @@ # original buildsystem will not be accepted. -add_subdirectory(tools) +add_subdirectory(ydb) add_subdirectory(contrib) add_subdirectory(util) add_subdirectory(library) -add_subdirectory(ydb) +add_subdirectory(tools) add_subdirectory(certs) diff --git a/contrib/libs/curl/CMakeLists.darwin-x86_64.txt b/contrib/libs/curl/CMakeLists.darwin-x86_64.txt index 7a5fb608355..ec5a4620e71 100644 --- a/contrib/libs/curl/CMakeLists.darwin-x86_64.txt +++ b/contrib/libs/curl/CMakeLists.darwin-x86_64.txt @@ -24,7 +24,6 @@ target_include_directories(contrib-libs-curl PUBLIC ${CMAKE_SOURCE_DIR}/contrib/libs/curl/include ) target_include_directories(contrib-libs-curl PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib ) target_link_libraries(contrib-libs-curl PUBLIC diff --git a/contrib/libs/curl/CMakeLists.linux-aarch64.txt b/contrib/libs/curl/CMakeLists.linux-aarch64.txt index 5609bd43b30..e722387ff10 100644 --- a/contrib/libs/curl/CMakeLists.linux-aarch64.txt +++ b/contrib/libs/curl/CMakeLists.linux-aarch64.txt @@ -24,7 +24,6 @@ target_include_directories(contrib-libs-curl PUBLIC ${CMAKE_SOURCE_DIR}/contrib/libs/curl/include ) target_include_directories(contrib-libs-curl PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib ) target_link_libraries(contrib-libs-curl PUBLIC diff --git a/contrib/libs/curl/CMakeLists.linux-x86_64.txt b/contrib/libs/curl/CMakeLists.linux-x86_64.txt index 5609bd43b30..e722387ff10 100644 --- a/contrib/libs/curl/CMakeLists.linux-x86_64.txt +++ b/contrib/libs/curl/CMakeLists.linux-x86_64.txt @@ -24,7 +24,6 @@ target_include_directories(contrib-libs-curl PUBLIC ${CMAKE_SOURCE_DIR}/contrib/libs/curl/include ) target_include_directories(contrib-libs-curl PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib ) target_link_libraries(contrib-libs-curl PUBLIC diff --git a/contrib/libs/curl/CMakeLists.windows-x86_64.txt b/contrib/libs/curl/CMakeLists.windows-x86_64.txt index 7b476845933..ccbd6c13634 100644 --- a/contrib/libs/curl/CMakeLists.windows-x86_64.txt +++ b/contrib/libs/curl/CMakeLists.windows-x86_64.txt @@ -24,7 +24,6 @@ target_include_directories(contrib-libs-curl PUBLIC ${CMAKE_SOURCE_DIR}/contrib/libs/curl/include ) target_include_directories(contrib-libs-curl PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib ) target_link_libraries(contrib-libs-curl PUBLIC diff --git a/contrib/libs/farmhash/CMakeLists.darwin-x86_64.txt b/contrib/libs/farmhash/CMakeLists.darwin-x86_64.txt index aeb7bb29c0e..68129b7b39d 100644 --- a/contrib/libs/farmhash/CMakeLists.darwin-x86_64.txt +++ b/contrib/libs/farmhash/CMakeLists.darwin-x86_64.txt @@ -12,9 +12,6 @@ add_library(contrib-libs-farmhash) target_compile_options(contrib-libs-farmhash PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything> ) -target_include_directories(contrib-libs-farmhash PUBLIC - ${CMAKE_SOURCE_DIR}/contrib/libs/farmhash/include -) target_link_libraries(contrib-libs-farmhash PUBLIC contrib-libs-cxxsupp yutil diff --git a/contrib/libs/farmhash/CMakeLists.linux-aarch64.txt b/contrib/libs/farmhash/CMakeLists.linux-aarch64.txt index e4fa621f996..ce03a86de35 100644 --- a/contrib/libs/farmhash/CMakeLists.linux-aarch64.txt +++ b/contrib/libs/farmhash/CMakeLists.linux-aarch64.txt @@ -12,9 +12,6 @@ add_library(contrib-libs-farmhash) target_compile_options(contrib-libs-farmhash PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything> ) -target_include_directories(contrib-libs-farmhash PUBLIC - ${CMAKE_SOURCE_DIR}/contrib/libs/farmhash/include -) target_link_libraries(contrib-libs-farmhash PUBLIC contrib-libs-linux-headers contrib-libs-cxxsupp diff --git a/contrib/libs/farmhash/CMakeLists.linux-x86_64.txt b/contrib/libs/farmhash/CMakeLists.linux-x86_64.txt index e4fa621f996..ce03a86de35 100644 --- a/contrib/libs/farmhash/CMakeLists.linux-x86_64.txt +++ b/contrib/libs/farmhash/CMakeLists.linux-x86_64.txt @@ -12,9 +12,6 @@ add_library(contrib-libs-farmhash) target_compile_options(contrib-libs-farmhash PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything> ) -target_include_directories(contrib-libs-farmhash PUBLIC - ${CMAKE_SOURCE_DIR}/contrib/libs/farmhash/include -) target_link_libraries(contrib-libs-farmhash PUBLIC contrib-libs-linux-headers contrib-libs-cxxsupp diff --git a/contrib/libs/farmhash/CMakeLists.windows-x86_64.txt b/contrib/libs/farmhash/CMakeLists.windows-x86_64.txt index aeb7bb29c0e..68129b7b39d 100644 --- a/contrib/libs/farmhash/CMakeLists.windows-x86_64.txt +++ b/contrib/libs/farmhash/CMakeLists.windows-x86_64.txt @@ -12,9 +12,6 @@ add_library(contrib-libs-farmhash) target_compile_options(contrib-libs-farmhash PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything> ) -target_include_directories(contrib-libs-farmhash PUBLIC - ${CMAKE_SOURCE_DIR}/contrib/libs/farmhash/include -) target_link_libraries(contrib-libs-farmhash PUBLIC contrib-libs-cxxsupp yutil diff --git a/contrib/libs/linux-headers/CMakeLists.linux-aarch64.txt b/contrib/libs/linux-headers/CMakeLists.linux-aarch64.txt index 550534bb102..aa584b0c69f 100644 --- a/contrib/libs/linux-headers/CMakeLists.linux-aarch64.txt +++ b/contrib/libs/linux-headers/CMakeLists.linux-aarch64.txt @@ -10,5 +10,4 @@ add_library(contrib-libs-linux-headers INTERFACE) target_include_directories(contrib-libs-linux-headers INTERFACE ${CMAKE_SOURCE_DIR}/contrib/libs/linux-headers - ${CMAKE_SOURCE_DIR}/contrib/libs/linux-headers/_nf ) diff --git a/contrib/libs/linux-headers/CMakeLists.linux-x86_64.txt b/contrib/libs/linux-headers/CMakeLists.linux-x86_64.txt index 550534bb102..aa584b0c69f 100644 --- a/contrib/libs/linux-headers/CMakeLists.linux-x86_64.txt +++ b/contrib/libs/linux-headers/CMakeLists.linux-x86_64.txt @@ -10,5 +10,4 @@ add_library(contrib-libs-linux-headers INTERFACE) target_include_directories(contrib-libs-linux-headers INTERFACE ${CMAKE_SOURCE_DIR}/contrib/libs/linux-headers - ${CMAKE_SOURCE_DIR}/contrib/libs/linux-headers/_nf ) diff --git a/contrib/libs/llvm12/include/CMakeLists.darwin-x86_64.txt b/contrib/libs/llvm12/include/CMakeLists.darwin-x86_64.txt index 7ea3024199a..fd3a4c84d26 100644 --- a/contrib/libs/llvm12/include/CMakeLists.darwin-x86_64.txt +++ b/contrib/libs/llvm12/include/CMakeLists.darwin-x86_64.txt @@ -8002,7 +8002,3 @@ if(NOT CMAKE_CROSSCOMPILING) llvm-tblgen ) endif() -add_custom_target(OpenMP-gen-srcs-stealing - DEPENDS ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMP.cpp -) - diff --git a/contrib/libs/llvm12/include/CMakeLists.linux-aarch64.txt b/contrib/libs/llvm12/include/CMakeLists.linux-aarch64.txt index 468c652df5d..5ff0813de68 100644 --- a/contrib/libs/llvm12/include/CMakeLists.linux-aarch64.txt +++ b/contrib/libs/llvm12/include/CMakeLists.linux-aarch64.txt @@ -8003,7 +8003,3 @@ if(NOT CMAKE_CROSSCOMPILING) llvm-tblgen ) endif() -add_custom_target(OpenMP-gen-srcs-stealing - DEPENDS ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMP.cpp -) - diff --git a/contrib/libs/llvm12/include/CMakeLists.linux-x86_64.txt b/contrib/libs/llvm12/include/CMakeLists.linux-x86_64.txt index 468c652df5d..5ff0813de68 100644 --- a/contrib/libs/llvm12/include/CMakeLists.linux-x86_64.txt +++ b/contrib/libs/llvm12/include/CMakeLists.linux-x86_64.txt @@ -8003,7 +8003,3 @@ if(NOT CMAKE_CROSSCOMPILING) llvm-tblgen ) endif() -add_custom_target(OpenMP-gen-srcs-stealing - DEPENDS ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMP.cpp -) - diff --git a/contrib/libs/llvm12/include/CMakeLists.windows-x86_64.txt b/contrib/libs/llvm12/include/CMakeLists.windows-x86_64.txt index 7ea3024199a..fd3a4c84d26 100644 --- a/contrib/libs/llvm12/include/CMakeLists.windows-x86_64.txt +++ b/contrib/libs/llvm12/include/CMakeLists.windows-x86_64.txt @@ -8002,7 +8002,3 @@ if(NOT CMAKE_CROSSCOMPILING) llvm-tblgen ) endif() -add_custom_target(OpenMP-gen-srcs-stealing - DEPENDS ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMP.cpp -) - diff --git a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.darwin-x86_64.txt b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.darwin-x86_64.txt index ff198fe772d..5dbbc7a076b 100644 --- a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.darwin-x86_64.txt +++ b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.darwin-x86_64.txt @@ -1,7 +1,3 @@ -set_property(SOURCE ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMP.cpp - PROPERTY GENERATED On -) - # This file was generated by the build system used internally in the Yandex monorepo. # Only simple modifications are allowed (adding source-files to targets, adding simple properties @@ -31,6 +27,3 @@ target_sources(lib-Frontend-OpenMP PRIVATE ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMPContext.cpp ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMPIRBuilder.cpp ) - -add_dependencies(lib-Frontend-OpenMP OpenMP-gen-srcs-stealing) - diff --git a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux-aarch64.txt b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux-aarch64.txt index 879a65a6cb4..b6f1808f22b 100644 --- a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux-aarch64.txt +++ b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux-aarch64.txt @@ -1,7 +1,3 @@ -set_property(SOURCE ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMP.cpp - PROPERTY GENERATED On -) - # This file was generated by the build system used internally in the Yandex monorepo. # Only simple modifications are allowed (adding source-files to targets, adding simple properties @@ -32,6 +28,3 @@ target_sources(lib-Frontend-OpenMP PRIVATE ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMPContext.cpp ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMPIRBuilder.cpp ) - -add_dependencies(lib-Frontend-OpenMP OpenMP-gen-srcs-stealing) - diff --git a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux-x86_64.txt b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux-x86_64.txt index 879a65a6cb4..b6f1808f22b 100644 --- a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux-x86_64.txt +++ b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.linux-x86_64.txt @@ -1,7 +1,3 @@ -set_property(SOURCE ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMP.cpp - PROPERTY GENERATED On -) - # This file was generated by the build system used internally in the Yandex monorepo. # Only simple modifications are allowed (adding source-files to targets, adding simple properties @@ -32,6 +28,3 @@ target_sources(lib-Frontend-OpenMP PRIVATE ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMPContext.cpp ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMPIRBuilder.cpp ) - -add_dependencies(lib-Frontend-OpenMP OpenMP-gen-srcs-stealing) - diff --git a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.windows-x86_64.txt b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.windows-x86_64.txt index ff198fe772d..5dbbc7a076b 100644 --- a/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.windows-x86_64.txt +++ b/contrib/libs/llvm12/lib/Frontend/OpenMP/CMakeLists.windows-x86_64.txt @@ -1,7 +1,3 @@ -set_property(SOURCE ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMP.cpp - PROPERTY GENERATED On -) - # This file was generated by the build system used internally in the Yandex monorepo. # Only simple modifications are allowed (adding source-files to targets, adding simple properties @@ -31,6 +27,3 @@ target_sources(lib-Frontend-OpenMP PRIVATE ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMPContext.cpp ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/lib/Frontend/OpenMP/OMPIRBuilder.cpp ) - -add_dependencies(lib-Frontend-OpenMP OpenMP-gen-srcs-stealing) - diff --git a/contrib/restricted/boost/bimap/CMakeLists.darwin-x86_64.txt b/contrib/restricted/boost/bimap/CMakeLists.darwin-x86_64.txt index 8b9c9a66cad..80996f9c822 100644 --- a/contrib/restricted/boost/bimap/CMakeLists.darwin-x86_64.txt +++ b/contrib/restricted/boost/bimap/CMakeLists.darwin-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-bimap INTERFACE) -target_include_directories(restricted-boost-bimap INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/bimap/include -) target_link_libraries(restricted-boost-bimap INTERFACE contrib-libs-cxxsupp restricted-boost-concept_check diff --git a/contrib/restricted/boost/bimap/CMakeLists.linux-x86_64.txt b/contrib/restricted/boost/bimap/CMakeLists.linux-x86_64.txt index a6dc2f420a1..91fa7ed73d5 100644 --- a/contrib/restricted/boost/bimap/CMakeLists.linux-x86_64.txt +++ b/contrib/restricted/boost/bimap/CMakeLists.linux-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-bimap INTERFACE) -target_include_directories(restricted-boost-bimap INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/bimap/include -) target_link_libraries(restricted-boost-bimap INTERFACE contrib-libs-linux-headers contrib-libs-cxxsupp diff --git a/contrib/restricted/boost/bimap/CMakeLists.windows-x86_64.txt b/contrib/restricted/boost/bimap/CMakeLists.windows-x86_64.txt index 8b9c9a66cad..80996f9c822 100644 --- a/contrib/restricted/boost/bimap/CMakeLists.windows-x86_64.txt +++ b/contrib/restricted/boost/bimap/CMakeLists.windows-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-bimap INTERFACE) -target_include_directories(restricted-boost-bimap INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/bimap/include -) target_link_libraries(restricted-boost-bimap INTERFACE contrib-libs-cxxsupp restricted-boost-concept_check diff --git a/contrib/restricted/boost/endian/CMakeLists.darwin-x86_64.txt b/contrib/restricted/boost/endian/CMakeLists.darwin-x86_64.txt index ddf28f75fe4..9bfcb241b1f 100644 --- a/contrib/restricted/boost/endian/CMakeLists.darwin-x86_64.txt +++ b/contrib/restricted/boost/endian/CMakeLists.darwin-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-endian INTERFACE) -target_include_directories(restricted-boost-endian INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/endian/include -) target_link_libraries(restricted-boost-endian INTERFACE contrib-libs-cxxsupp restricted-boost-config diff --git a/contrib/restricted/boost/endian/CMakeLists.linux-x86_64.txt b/contrib/restricted/boost/endian/CMakeLists.linux-x86_64.txt index 8a7f037fd78..b5e14bf65e6 100644 --- a/contrib/restricted/boost/endian/CMakeLists.linux-x86_64.txt +++ b/contrib/restricted/boost/endian/CMakeLists.linux-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-endian INTERFACE) -target_include_directories(restricted-boost-endian INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/endian/include -) target_link_libraries(restricted-boost-endian INTERFACE contrib-libs-linux-headers contrib-libs-cxxsupp diff --git a/contrib/restricted/boost/endian/CMakeLists.windows-x86_64.txt b/contrib/restricted/boost/endian/CMakeLists.windows-x86_64.txt index ddf28f75fe4..9bfcb241b1f 100644 --- a/contrib/restricted/boost/endian/CMakeLists.windows-x86_64.txt +++ b/contrib/restricted/boost/endian/CMakeLists.windows-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-endian INTERFACE) -target_include_directories(restricted-boost-endian INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/endian/include -) target_link_libraries(restricted-boost-endian INTERFACE contrib-libs-cxxsupp restricted-boost-config diff --git a/contrib/restricted/boost/lambda/CMakeLists.darwin-x86_64.txt b/contrib/restricted/boost/lambda/CMakeLists.darwin-x86_64.txt index f3556a1958e..8f2f6595f5f 100644 --- a/contrib/restricted/boost/lambda/CMakeLists.darwin-x86_64.txt +++ b/contrib/restricted/boost/lambda/CMakeLists.darwin-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-lambda INTERFACE) -target_include_directories(restricted-boost-lambda INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/lambda/include -) target_link_libraries(restricted-boost-lambda INTERFACE contrib-libs-cxxsupp restricted-boost-bind diff --git a/contrib/restricted/boost/lambda/CMakeLists.linux-x86_64.txt b/contrib/restricted/boost/lambda/CMakeLists.linux-x86_64.txt index ba6f725eadb..b3f405c3ee1 100644 --- a/contrib/restricted/boost/lambda/CMakeLists.linux-x86_64.txt +++ b/contrib/restricted/boost/lambda/CMakeLists.linux-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-lambda INTERFACE) -target_include_directories(restricted-boost-lambda INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/lambda/include -) target_link_libraries(restricted-boost-lambda INTERFACE contrib-libs-linux-headers contrib-libs-cxxsupp diff --git a/contrib/restricted/boost/lambda/CMakeLists.windows-x86_64.txt b/contrib/restricted/boost/lambda/CMakeLists.windows-x86_64.txt index f3556a1958e..8f2f6595f5f 100644 --- a/contrib/restricted/boost/lambda/CMakeLists.windows-x86_64.txt +++ b/contrib/restricted/boost/lambda/CMakeLists.windows-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-lambda INTERFACE) -target_include_directories(restricted-boost-lambda INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/lambda/include -) target_link_libraries(restricted-boost-lambda INTERFACE contrib-libs-cxxsupp restricted-boost-bind diff --git a/contrib/restricted/boost/phoenix/CMakeLists.darwin-x86_64.txt b/contrib/restricted/boost/phoenix/CMakeLists.darwin-x86_64.txt index 7bf8181aa5e..6be8ce7372e 100644 --- a/contrib/restricted/boost/phoenix/CMakeLists.darwin-x86_64.txt +++ b/contrib/restricted/boost/phoenix/CMakeLists.darwin-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-phoenix INTERFACE) -target_include_directories(restricted-boost-phoenix INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/phoenix/include -) target_link_libraries(restricted-boost-phoenix INTERFACE contrib-libs-cxxsupp restricted-boost-assert diff --git a/contrib/restricted/boost/phoenix/CMakeLists.linux-x86_64.txt b/contrib/restricted/boost/phoenix/CMakeLists.linux-x86_64.txt index 80062339a36..5f8cf7e9a56 100644 --- a/contrib/restricted/boost/phoenix/CMakeLists.linux-x86_64.txt +++ b/contrib/restricted/boost/phoenix/CMakeLists.linux-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-phoenix INTERFACE) -target_include_directories(restricted-boost-phoenix INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/phoenix/include -) target_link_libraries(restricted-boost-phoenix INTERFACE contrib-libs-linux-headers contrib-libs-cxxsupp diff --git a/contrib/restricted/boost/phoenix/CMakeLists.windows-x86_64.txt b/contrib/restricted/boost/phoenix/CMakeLists.windows-x86_64.txt index 7bf8181aa5e..6be8ce7372e 100644 --- a/contrib/restricted/boost/phoenix/CMakeLists.windows-x86_64.txt +++ b/contrib/restricted/boost/phoenix/CMakeLists.windows-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-phoenix INTERFACE) -target_include_directories(restricted-boost-phoenix INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/phoenix/include -) target_link_libraries(restricted-boost-phoenix INTERFACE contrib-libs-cxxsupp restricted-boost-assert diff --git a/contrib/restricted/boost/pool/CMakeLists.darwin-x86_64.txt b/contrib/restricted/boost/pool/CMakeLists.darwin-x86_64.txt index a0e50e5cde2..6106cb55f87 100644 --- a/contrib/restricted/boost/pool/CMakeLists.darwin-x86_64.txt +++ b/contrib/restricted/boost/pool/CMakeLists.darwin-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-pool INTERFACE) -target_include_directories(restricted-boost-pool INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/pool/include -) target_link_libraries(restricted-boost-pool INTERFACE contrib-libs-cxxsupp restricted-boost-assert diff --git a/contrib/restricted/boost/pool/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/pool/CMakeLists.linux-aarch64.txt index a5d127cffbf..965a5d30301 100644 --- a/contrib/restricted/boost/pool/CMakeLists.linux-aarch64.txt +++ b/contrib/restricted/boost/pool/CMakeLists.linux-aarch64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-pool INTERFACE) -target_include_directories(restricted-boost-pool INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/pool/include -) target_link_libraries(restricted-boost-pool INTERFACE contrib-libs-linux-headers contrib-libs-cxxsupp diff --git a/contrib/restricted/boost/pool/CMakeLists.linux-x86_64.txt b/contrib/restricted/boost/pool/CMakeLists.linux-x86_64.txt index a5d127cffbf..965a5d30301 100644 --- a/contrib/restricted/boost/pool/CMakeLists.linux-x86_64.txt +++ b/contrib/restricted/boost/pool/CMakeLists.linux-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-pool INTERFACE) -target_include_directories(restricted-boost-pool INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/pool/include -) target_link_libraries(restricted-boost-pool INTERFACE contrib-libs-linux-headers contrib-libs-cxxsupp diff --git a/contrib/restricted/boost/pool/CMakeLists.windows-x86_64.txt b/contrib/restricted/boost/pool/CMakeLists.windows-x86_64.txt index a0e50e5cde2..6106cb55f87 100644 --- a/contrib/restricted/boost/pool/CMakeLists.windows-x86_64.txt +++ b/contrib/restricted/boost/pool/CMakeLists.windows-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-pool INTERFACE) -target_include_directories(restricted-boost-pool INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/pool/include -) target_link_libraries(restricted-boost-pool INTERFACE contrib-libs-cxxsupp restricted-boost-assert diff --git a/contrib/restricted/boost/variant2/CMakeLists.darwin-x86_64.txt b/contrib/restricted/boost/variant2/CMakeLists.darwin-x86_64.txt index faec5d90979..a4316a091b5 100644 --- a/contrib/restricted/boost/variant2/CMakeLists.darwin-x86_64.txt +++ b/contrib/restricted/boost/variant2/CMakeLists.darwin-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-variant2 INTERFACE) -target_include_directories(restricted-boost-variant2 INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/variant2/include -) target_link_libraries(restricted-boost-variant2 INTERFACE contrib-libs-cxxsupp restricted-boost-assert diff --git a/contrib/restricted/boost/variant2/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/variant2/CMakeLists.linux-aarch64.txt index b3cdd31e101..76c0b86f25f 100644 --- a/contrib/restricted/boost/variant2/CMakeLists.linux-aarch64.txt +++ b/contrib/restricted/boost/variant2/CMakeLists.linux-aarch64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-variant2 INTERFACE) -target_include_directories(restricted-boost-variant2 INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/variant2/include -) target_link_libraries(restricted-boost-variant2 INTERFACE contrib-libs-linux-headers contrib-libs-cxxsupp diff --git a/contrib/restricted/boost/variant2/CMakeLists.linux-x86_64.txt b/contrib/restricted/boost/variant2/CMakeLists.linux-x86_64.txt index b3cdd31e101..76c0b86f25f 100644 --- a/contrib/restricted/boost/variant2/CMakeLists.linux-x86_64.txt +++ b/contrib/restricted/boost/variant2/CMakeLists.linux-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-variant2 INTERFACE) -target_include_directories(restricted-boost-variant2 INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/variant2/include -) target_link_libraries(restricted-boost-variant2 INTERFACE contrib-libs-linux-headers contrib-libs-cxxsupp diff --git a/contrib/restricted/boost/variant2/CMakeLists.windows-x86_64.txt b/contrib/restricted/boost/variant2/CMakeLists.windows-x86_64.txt index faec5d90979..a4316a091b5 100644 --- a/contrib/restricted/boost/variant2/CMakeLists.windows-x86_64.txt +++ b/contrib/restricted/boost/variant2/CMakeLists.windows-x86_64.txt @@ -8,9 +8,6 @@ add_library(restricted-boost-variant2 INTERFACE) -target_include_directories(restricted-boost-variant2 INTERFACE - ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/variant2/include -) target_link_libraries(restricted-boost-variant2 INTERFACE contrib-libs-cxxsupp restricted-boost-assert diff --git a/library/cpp/actors/dnsresolver/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/dnsresolver/CMakeLists.darwin-x86_64.txt index d2cf8ae0e1f..8d9cb550f1a 100644 --- a/library/cpp/actors/dnsresolver/CMakeLists.darwin-x86_64.txt +++ b/library/cpp/actors/dnsresolver/CMakeLists.darwin-x86_64.txt @@ -10,9 +10,6 @@ find_package(c-ares REQUIRED) add_subdirectory(ut) add_library(cpp-actors-dnsresolver) -target_include_directories(cpp-actors-dnsresolver PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include -) target_link_libraries(cpp-actors-dnsresolver PUBLIC contrib-libs-cxxsupp yutil diff --git a/library/cpp/actors/dnsresolver/CMakeLists.linux-aarch64.txt b/library/cpp/actors/dnsresolver/CMakeLists.linux-aarch64.txt index 9f4ffdebad7..c4741c037e1 100644 --- a/library/cpp/actors/dnsresolver/CMakeLists.linux-aarch64.txt +++ b/library/cpp/actors/dnsresolver/CMakeLists.linux-aarch64.txt @@ -10,9 +10,6 @@ find_package(c-ares REQUIRED) add_subdirectory(ut) add_library(cpp-actors-dnsresolver) -target_include_directories(cpp-actors-dnsresolver PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include -) target_link_libraries(cpp-actors-dnsresolver PUBLIC contrib-libs-linux-headers contrib-libs-cxxsupp diff --git a/library/cpp/actors/dnsresolver/CMakeLists.linux-x86_64.txt b/library/cpp/actors/dnsresolver/CMakeLists.linux-x86_64.txt index 9f4ffdebad7..c4741c037e1 100644 --- a/library/cpp/actors/dnsresolver/CMakeLists.linux-x86_64.txt +++ b/library/cpp/actors/dnsresolver/CMakeLists.linux-x86_64.txt @@ -10,9 +10,6 @@ find_package(c-ares REQUIRED) add_subdirectory(ut) add_library(cpp-actors-dnsresolver) -target_include_directories(cpp-actors-dnsresolver PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include -) target_link_libraries(cpp-actors-dnsresolver PUBLIC contrib-libs-linux-headers contrib-libs-cxxsupp diff --git a/library/cpp/actors/dnsresolver/CMakeLists.windows-x86_64.txt b/library/cpp/actors/dnsresolver/CMakeLists.windows-x86_64.txt index d2cf8ae0e1f..8d9cb550f1a 100644 --- a/library/cpp/actors/dnsresolver/CMakeLists.windows-x86_64.txt +++ b/library/cpp/actors/dnsresolver/CMakeLists.windows-x86_64.txt @@ -10,9 +10,6 @@ find_package(c-ares REQUIRED) add_subdirectory(ut) add_library(cpp-actors-dnsresolver) -target_include_directories(cpp-actors-dnsresolver PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include -) target_link_libraries(cpp-actors-dnsresolver PUBLIC contrib-libs-cxxsupp yutil diff --git a/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-x86_64.txt index 9e092bba80b..553b9294184 100644 --- a/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-x86_64.txt +++ b/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-x86_64.txt @@ -10,7 +10,6 @@ add_executable(library-cpp-actors-dnsresolver-ut) target_include_directories(library-cpp-actors-dnsresolver-ut PRIVATE ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include ) target_link_libraries(library-cpp-actors-dnsresolver-ut PUBLIC contrib-libs-cxxsupp diff --git a/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-aarch64.txt index c8eb27acd0f..e9d4cb7ff35 100644 --- a/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-aarch64.txt +++ b/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-aarch64.txt @@ -10,7 +10,6 @@ add_executable(library-cpp-actors-dnsresolver-ut) target_include_directories(library-cpp-actors-dnsresolver-ut PRIVATE ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include ) target_link_libraries(library-cpp-actors-dnsresolver-ut PUBLIC contrib-libs-linux-headers diff --git a/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-x86_64.txt index eae7bc85a39..db7b60bc600 100644 --- a/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-x86_64.txt +++ b/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-x86_64.txt @@ -10,7 +10,6 @@ add_executable(library-cpp-actors-dnsresolver-ut) target_include_directories(library-cpp-actors-dnsresolver-ut PRIVATE ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include ) target_link_libraries(library-cpp-actors-dnsresolver-ut PUBLIC contrib-libs-linux-headers diff --git a/library/cpp/actors/dnsresolver/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/dnsresolver/ut/CMakeLists.windows-x86_64.txt index 7705d206a38..2e2fab4fb3e 100644 --- a/library/cpp/actors/dnsresolver/ut/CMakeLists.windows-x86_64.txt +++ b/library/cpp/actors/dnsresolver/ut/CMakeLists.windows-x86_64.txt @@ -10,7 +10,6 @@ add_executable(library-cpp-actors-dnsresolver-ut) target_include_directories(library-cpp-actors-dnsresolver-ut PRIVATE ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include ) target_link_libraries(library-cpp-actors-dnsresolver-ut PUBLIC contrib-libs-cxxsupp diff --git a/ydb/core/viewer/CMakeLists.darwin-x86_64.txt b/ydb/core/viewer/CMakeLists.darwin-x86_64.txt index b3fa682d724..bbd5bf18520 100644 --- a/ydb/core/viewer/CMakeLists.darwin-x86_64.txt +++ b/ydb/core/viewer/CMakeLists.darwin-x86_64.txt @@ -286,39 +286,3 @@ resources(ydb-core-viewer.global viewer/api/lib/swagger-oauth.js viewer/api/swagger-ui.min.js ) -option(YDB_EMBEDDED_UI_DEV_SNAPSHOT "Use latest dev version of embedded UI git repo" Off) -include(${CMAKE_CURRENT_SOURCE_DIR}/recursive_resources.cmake) - -if (YDB_EMBEDDED_UI_DEV_SNAPSHOT) - find_program(NPM_PATH NAMES npm REQUIRED) - - include(ExternalProject) - ExternalProject_Add(ydb-embedded-ui-git - GIT_REPOSITORY https://github.com/ydb-platform/ydb-embedded-ui.git - GIT_TAG main - USES_TERMINAL_DOWNLOAD On - USES_TERMINAL_UPDATE On - USES_TERMINAL_BUILD On - CONFIGURE_COMMAND "" - TEST_COMMAND "" - INSTALL_COMMAND "" - BUILD_IN_SOURCE On - BUILD_COMMAND ${NPM_PATH} ci - COMMAND ${NPM_PATH} run build:embedded - ) - ExternalProject_Get_property(ydb-embedded-ui-git SOURCE_DIR) - add_gen_resources(ydb-embedded-ui-git ${CMAKE_BINARY_DIR}/ydb/core/viewer/ydb_embedded_ui_monitoring.cpp - IN_DIR ${SOURCE_DIR}/build - PREFIX monitoring - ) - -else() - add_dir_resources(${CMAKE_BINARY_DIR}/ydb/core/viewer/ydb_embedded_ui_monitoring.cpp - IN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/monitoring - PREFIX monitoring - ) -endif() -target_sources(ydb-core-viewer.global PRIVATE - ${CMAKE_BINARY_DIR}/ydb/core/viewer/ydb_embedded_ui_monitoring.cpp -) - diff --git a/ydb/core/viewer/CMakeLists.linux-aarch64.txt b/ydb/core/viewer/CMakeLists.linux-aarch64.txt index e15b0052401..6faa5099944 100644 --- a/ydb/core/viewer/CMakeLists.linux-aarch64.txt +++ b/ydb/core/viewer/CMakeLists.linux-aarch64.txt @@ -288,39 +288,3 @@ resources(ydb-core-viewer.global viewer/api/lib/swagger-oauth.js viewer/api/swagger-ui.min.js ) -option(YDB_EMBEDDED_UI_DEV_SNAPSHOT "Use latest dev version of embedded UI git repo" Off) -include(${CMAKE_CURRENT_SOURCE_DIR}/recursive_resources.cmake) - -if (YDB_EMBEDDED_UI_DEV_SNAPSHOT) - find_program(NPM_PATH NAMES npm REQUIRED) - - include(ExternalProject) - ExternalProject_Add(ydb-embedded-ui-git - GIT_REPOSITORY https://github.com/ydb-platform/ydb-embedded-ui.git - GIT_TAG main - USES_TERMINAL_DOWNLOAD On - USES_TERMINAL_UPDATE On - USES_TERMINAL_BUILD On - CONFIGURE_COMMAND "" - TEST_COMMAND "" - INSTALL_COMMAND "" - BUILD_IN_SOURCE On - BUILD_COMMAND ${NPM_PATH} ci - COMMAND ${NPM_PATH} run build:embedded - ) - ExternalProject_Get_property(ydb-embedded-ui-git SOURCE_DIR) - add_gen_resources(ydb-embedded-ui-git ${CMAKE_BINARY_DIR}/ydb/core/viewer/ydb_embedded_ui_monitoring.cpp - IN_DIR ${SOURCE_DIR}/build - PREFIX monitoring - ) - -else() - add_dir_resources(${CMAKE_BINARY_DIR}/ydb/core/viewer/ydb_embedded_ui_monitoring.cpp - IN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/monitoring - PREFIX monitoring - ) -endif() -target_sources(ydb-core-viewer.global PRIVATE - ${CMAKE_BINARY_DIR}/ydb/core/viewer/ydb_embedded_ui_monitoring.cpp -) - diff --git a/ydb/core/viewer/CMakeLists.linux-x86_64.txt b/ydb/core/viewer/CMakeLists.linux-x86_64.txt index e15b0052401..6faa5099944 100644 --- a/ydb/core/viewer/CMakeLists.linux-x86_64.txt +++ b/ydb/core/viewer/CMakeLists.linux-x86_64.txt @@ -288,39 +288,3 @@ resources(ydb-core-viewer.global viewer/api/lib/swagger-oauth.js viewer/api/swagger-ui.min.js ) -option(YDB_EMBEDDED_UI_DEV_SNAPSHOT "Use latest dev version of embedded UI git repo" Off) -include(${CMAKE_CURRENT_SOURCE_DIR}/recursive_resources.cmake) - -if (YDB_EMBEDDED_UI_DEV_SNAPSHOT) - find_program(NPM_PATH NAMES npm REQUIRED) - - include(ExternalProject) - ExternalProject_Add(ydb-embedded-ui-git - GIT_REPOSITORY https://github.com/ydb-platform/ydb-embedded-ui.git - GIT_TAG main - USES_TERMINAL_DOWNLOAD On - USES_TERMINAL_UPDATE On - USES_TERMINAL_BUILD On - CONFIGURE_COMMAND "" - TEST_COMMAND "" - INSTALL_COMMAND "" - BUILD_IN_SOURCE On - BUILD_COMMAND ${NPM_PATH} ci - COMMAND ${NPM_PATH} run build:embedded - ) - ExternalProject_Get_property(ydb-embedded-ui-git SOURCE_DIR) - add_gen_resources(ydb-embedded-ui-git ${CMAKE_BINARY_DIR}/ydb/core/viewer/ydb_embedded_ui_monitoring.cpp - IN_DIR ${SOURCE_DIR}/build - PREFIX monitoring - ) - -else() - add_dir_resources(${CMAKE_BINARY_DIR}/ydb/core/viewer/ydb_embedded_ui_monitoring.cpp - IN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/monitoring - PREFIX monitoring - ) -endif() -target_sources(ydb-core-viewer.global PRIVATE - ${CMAKE_BINARY_DIR}/ydb/core/viewer/ydb_embedded_ui_monitoring.cpp -) - diff --git a/ydb/core/viewer/CMakeLists.windows-x86_64.txt b/ydb/core/viewer/CMakeLists.windows-x86_64.txt index b3fa682d724..bbd5bf18520 100644 --- a/ydb/core/viewer/CMakeLists.windows-x86_64.txt +++ b/ydb/core/viewer/CMakeLists.windows-x86_64.txt @@ -286,39 +286,3 @@ resources(ydb-core-viewer.global viewer/api/lib/swagger-oauth.js viewer/api/swagger-ui.min.js ) -option(YDB_EMBEDDED_UI_DEV_SNAPSHOT "Use latest dev version of embedded UI git repo" Off) -include(${CMAKE_CURRENT_SOURCE_DIR}/recursive_resources.cmake) - -if (YDB_EMBEDDED_UI_DEV_SNAPSHOT) - find_program(NPM_PATH NAMES npm REQUIRED) - - include(ExternalProject) - ExternalProject_Add(ydb-embedded-ui-git - GIT_REPOSITORY https://github.com/ydb-platform/ydb-embedded-ui.git - GIT_TAG main - USES_TERMINAL_DOWNLOAD On - USES_TERMINAL_UPDATE On - USES_TERMINAL_BUILD On - CONFIGURE_COMMAND "" - TEST_COMMAND "" - INSTALL_COMMAND "" - BUILD_IN_SOURCE On - BUILD_COMMAND ${NPM_PATH} ci - COMMAND ${NPM_PATH} run build:embedded - ) - ExternalProject_Get_property(ydb-embedded-ui-git SOURCE_DIR) - add_gen_resources(ydb-embedded-ui-git ${CMAKE_BINARY_DIR}/ydb/core/viewer/ydb_embedded_ui_monitoring.cpp - IN_DIR ${SOURCE_DIR}/build - PREFIX monitoring - ) - -else() - add_dir_resources(${CMAKE_BINARY_DIR}/ydb/core/viewer/ydb_embedded_ui_monitoring.cpp - IN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/monitoring - PREFIX monitoring - ) -endif() -target_sources(ydb-core-viewer.global PRIVATE - ${CMAKE_BINARY_DIR}/ydb/core/viewer/ydb_embedded_ui_monitoring.cpp -) - diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt index 791e1ba67fd..e1eb5b916e5 100644 --- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt +++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt @@ -96,7 +96,6 @@ target_compile_options(yql-parser-pg_wrapper PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything> ) target_include_directories(yql-parser-pg_wrapper PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/libiconv/include ${CMAKE_SOURCE_DIR}/contrib/libs/lz4 ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/pg_wrapper/postgresql/src/backend/bootstrap ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/pg_wrapper/postgresql/src/backend/parser diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-aarch64.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-aarch64.txt index ecc1f941e85..04db01a14cd 100644 --- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-aarch64.txt +++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-aarch64.txt @@ -94,7 +94,6 @@ target_compile_options(yql-parser-pg_wrapper PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything> ) target_include_directories(yql-parser-pg_wrapper PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/libiconv/include ${CMAKE_SOURCE_DIR}/contrib/libs/lz4 ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/pg_wrapper/postgresql/src/backend/bootstrap ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/pg_wrapper/postgresql/src/backend/parser diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt index 522eef8bbd0..c39e12f5b54 100644 --- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt +++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt @@ -96,7 +96,6 @@ target_compile_options(yql-parser-pg_wrapper PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything> ) target_include_directories(yql-parser-pg_wrapper PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/libiconv/include ${CMAKE_SOURCE_DIR}/contrib/libs/lz4 ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/pg_wrapper/postgresql/src/backend/bootstrap ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/pg_wrapper/postgresql/src/backend/parser diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.windows-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.windows-x86_64.txt index 041aac3f40f..d2a99024434 100644 --- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.windows-x86_64.txt +++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.windows-x86_64.txt @@ -109,7 +109,6 @@ target_compile_options(yql-parser-pg_wrapper PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything> ) target_include_directories(yql-parser-pg_wrapper PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/libiconv/include ${CMAKE_SOURCE_DIR}/contrib/libs/lz4 ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/pg_wrapper/postgresql/src/backend/bootstrap ${CMAKE_SOURCE_DIR}/ydb/library/yql/parser/pg_wrapper/postgresql/src/backend/parser diff --git a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.darwin-x86_64.txt index 02b893de3bd..89dd05fc18b 100644 --- a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.darwin-x86_64.txt +++ b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.darwin-x86_64.txt @@ -57,13 +57,3 @@ run_antlr( -fo ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1 ) -set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_MULTILINE_COMMENT_CORE ".") -configure_file( - ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v1/SQLv1.g.in - ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1.g -) - - - diff --git a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-aarch64.txt b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-aarch64.txt index d1fd41654f5..21b211242f7 100644 --- a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-aarch64.txt +++ b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-aarch64.txt @@ -58,13 +58,3 @@ run_antlr( -fo ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1 ) -set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_MULTILINE_COMMENT_CORE ".") -configure_file( - ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v1/SQLv1.g.in - ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1.g -) - - - diff --git a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-x86_64.txt index d1fd41654f5..21b211242f7 100644 --- a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-x86_64.txt +++ b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.linux-x86_64.txt @@ -58,13 +58,3 @@ run_antlr( -fo ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1 ) -set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_MULTILINE_COMMENT_CORE ".") -configure_file( - ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v1/SQLv1.g.in - ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1.g -) - - - diff --git a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.windows-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.windows-x86_64.txt index 02b893de3bd..89dd05fc18b 100644 --- a/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.windows-x86_64.txt +++ b/ydb/library/yql/parser/proto_ast/gen/v1/CMakeLists.windows-x86_64.txt @@ -57,13 +57,3 @@ run_antlr( -fo ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1 ) -set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_MULTILINE_COMMENT_CORE ".") -configure_file( - ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v1/SQLv1.g.in - ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1/SQLv1.g -) - - - diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.darwin-x86_64.txt index 7ce8f04bcfa..4533b2bd9a6 100644 --- a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.darwin-x86_64.txt +++ b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.darwin-x86_64.txt @@ -57,14 +57,3 @@ run_antlr( -fo ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi ) -set(GRAMMAR_STRING_CORE_SINGLE "~QUOTE_SINGLE | (QUOTE_SINGLE QUOTE_SINGLE)") -set(GRAMMAR_STRING_CORE_DOUBLE "~QUOTE_DOUBLE | (QUOTE_DOUBLE QUOTE_DOUBLE)") -set(GRAMMAR_MULTILINE_COMMENT_CORE "MULTILINE_COMMENT | .") - -configure_file( - ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v1/SQLv1.g.in - ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1.g -) - - - diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-aarch64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-aarch64.txt index b0255d7b59c..2535674bbde 100644 --- a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-aarch64.txt +++ b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-aarch64.txt @@ -58,14 +58,3 @@ run_antlr( -fo ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi ) -set(GRAMMAR_STRING_CORE_SINGLE "~QUOTE_SINGLE | (QUOTE_SINGLE QUOTE_SINGLE)") -set(GRAMMAR_STRING_CORE_DOUBLE "~QUOTE_DOUBLE | (QUOTE_DOUBLE QUOTE_DOUBLE)") -set(GRAMMAR_MULTILINE_COMMENT_CORE "MULTILINE_COMMENT | .") - -configure_file( - ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v1/SQLv1.g.in - ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1.g -) - - - diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-x86_64.txt index b0255d7b59c..2535674bbde 100644 --- a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-x86_64.txt +++ b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.linux-x86_64.txt @@ -58,14 +58,3 @@ run_antlr( -fo ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi ) -set(GRAMMAR_STRING_CORE_SINGLE "~QUOTE_SINGLE | (QUOTE_SINGLE QUOTE_SINGLE)") -set(GRAMMAR_STRING_CORE_DOUBLE "~QUOTE_DOUBLE | (QUOTE_DOUBLE QUOTE_DOUBLE)") -set(GRAMMAR_MULTILINE_COMMENT_CORE "MULTILINE_COMMENT | .") - -configure_file( - ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v1/SQLv1.g.in - ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1.g -) - - - diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.windows-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.windows-x86_64.txt index 7ce8f04bcfa..4533b2bd9a6 100644 --- a/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.windows-x86_64.txt +++ b/ydb/library/yql/parser/proto_ast/gen/v1_ansi/CMakeLists.windows-x86_64.txt @@ -57,14 +57,3 @@ run_antlr( -fo ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi ) -set(GRAMMAR_STRING_CORE_SINGLE "~QUOTE_SINGLE | (QUOTE_SINGLE QUOTE_SINGLE)") -set(GRAMMAR_STRING_CORE_DOUBLE "~QUOTE_DOUBLE | (QUOTE_DOUBLE QUOTE_DOUBLE)") -set(GRAMMAR_MULTILINE_COMMENT_CORE "MULTILINE_COMMENT | .") - -configure_file( - ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v1/SQLv1.g.in - ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_ansi/SQLv1.g -) - - - diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.darwin-x86_64.txt index 6e54b1e3408..9a71008aa3b 100644 --- a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.darwin-x86_64.txt +++ b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.darwin-x86_64.txt @@ -69,13 +69,3 @@ target_proto_outs(proto_ast-gen-v1_proto --cpp_out=${CMAKE_BINARY_DIR}/ --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ ) -set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_MULTILINE_COMMENT_CORE ".") - -configure_file( - ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v1/SQLv1.g.in - ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g -) - - diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-aarch64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-aarch64.txt index f9c920556c5..6b5095bb834 100644 --- a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-aarch64.txt +++ b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-aarch64.txt @@ -70,13 +70,3 @@ target_proto_outs(proto_ast-gen-v1_proto --cpp_out=${CMAKE_BINARY_DIR}/ --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ ) -set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_MULTILINE_COMMENT_CORE ".") - -configure_file( - ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v1/SQLv1.g.in - ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g -) - - diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-x86_64.txt index f9c920556c5..6b5095bb834 100644 --- a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-x86_64.txt +++ b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-x86_64.txt @@ -70,13 +70,3 @@ target_proto_outs(proto_ast-gen-v1_proto --cpp_out=${CMAKE_BINARY_DIR}/ --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ ) -set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_MULTILINE_COMMENT_CORE ".") - -configure_file( - ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v1/SQLv1.g.in - ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g -) - - diff --git a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.windows-x86_64.txt b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.windows-x86_64.txt index 6e54b1e3408..9a71008aa3b 100644 --- a/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.windows-x86_64.txt +++ b/ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.windows-x86_64.txt @@ -69,13 +69,3 @@ target_proto_outs(proto_ast-gen-v1_proto --cpp_out=${CMAKE_BINARY_DIR}/ --cpp_styleguide_out=${CMAKE_BINARY_DIR}/ ) -set(GRAMMAR_STRING_CORE_SINGLE "~(QUOTE_SINGLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_STRING_CORE_DOUBLE "~(QUOTE_DOUBLE | BACKSLASH) | (BACKSLASH .)") -set(GRAMMAR_MULTILINE_COMMENT_CORE ".") - -configure_file( - ${CMAKE_SOURCE_DIR}/ydb/library/yql/sql/v1/SQLv1.g.in - ${CMAKE_BINARY_DIR}/ydb/library/yql/parser/proto_ast/gen/v1_proto/SQLv1.g -) - - |