Browse Source

intermediate changes
ref:582ed9d2a52706516cc273d3e82d8e3de510b40f

arcadia-devtools 3 years ago
parent
commit
fd6dda9a4b

+ 1 - 1
CMakeLists.txt

@@ -5,7 +5,7 @@ set(BUILD_SHARED_LIBS Off)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_EXTENSIONS Off)
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR})
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake)
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
 enable_testing()
 include(cmake/antlr.cmake)

+ 5 - 0
certs/CMakeLists.txt

@@ -6,6 +6,11 @@ target_link_libraries(certs INTERFACE
 )
 
 add_global_library_for(certs.global certs)
+target_link_libraries(certs.global INTERFACE
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-resource
+)
 target_sources(certs.global PRIVATE
   ${CMAKE_BINARY_DIR}/certs/b03c08f91a00a60ac9d7daef45f3075a.cpp
 )

+ 6 - 0
contrib/libs/cctz/tzdata/CMakeLists.txt

@@ -7,6 +7,12 @@ target_link_libraries(libs-cctz-tzdata INTERFACE
 )
 
 add_global_library_for(libs-cctz-tzdata.global libs-cctz-tzdata)
+target_link_libraries(libs-cctz-tzdata.global INTERFACE
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-cctz
+  library-cpp-resource
+)
 target_sources(libs-cctz-tzdata.global PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/cctz/tzdata/factory.cpp
   ${CMAKE_BINARY_DIR}/contrib/libs/cctz/tzdata/798da2443778cbca06089b6be4a5909d.cpp

+ 114 - 2
contrib/libs/llvm12/include/CMakeLists.txt

@@ -1,8 +1,120 @@
-add_library(libs-llvm12-include INTERFACE)
-target_link_libraries(libs-llvm12-include INTERFACE
+add_library(libs-llvm12-include STATIC)
+set_property(TARGET libs-llvm12-include PROPERTY
+  LINKER_LANGUAGE CXX
+)
+target_link_libraries(libs-llvm12-include PUBLIC
   contrib-libs-cxxsupp
   contrib-libs-llvm12
 )
+target_sources(libs-llvm12-include PRIVATE
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/Frontend/OpenACC/ACC.h.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/Frontend/OpenMP/OMP.h.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/Attributes.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicEnums.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicImpl.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsAArch64.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsAMDGPU.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsARM.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsBPF.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsHexagon.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsMips.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsNVPTX.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsPowerPC.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsR600.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsRISCV.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsS390.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsVE.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsWebAssembly.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsX86.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/IR/IntrinsicsXCore.h
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenAsmMatcher.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenAsmWriter.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenAsmWriter1.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenCallingConv.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenDAGISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenDisassemblerTables.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenExegesis.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenFastISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenGlobalISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenInstrInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenMCCodeEmitter.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenMCPseudoLowering.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenPostLegalizeGICombiner.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenPostLegalizeGILowering.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenPreLegalizeGICombiner.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenRegisterBank.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenRegisterInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenSubtargetInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/AArch64/AArch64GenSystemOperands.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenAsmMatcher.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenAsmWriter.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenCallingConv.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenDAGISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenDisassemblerTables.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenFastISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenGlobalISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenInstrInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenMCCodeEmitter.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenMCPseudoLowering.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenRegisterBank.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenRegisterInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenSubtargetInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/ARM/ARMGenSystemRegister.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenAsmMatcher.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenAsmWriter.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenCallingConv.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenDAGISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenDisassemblerTables.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenInstrInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenMCCodeEmitter.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenRegisterInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/BPF/BPFGenSubtargetInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/NVPTX/NVPTXGenAsmWriter.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/NVPTX/NVPTXGenDAGISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/NVPTX/NVPTXGenInstrInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/NVPTX/NVPTXGenRegisterInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/NVPTX/NVPTXGenSubtargetInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenAsmMatcher.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenAsmWriter.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenCallingConv.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenDAGISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenDisassemblerTables.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenExegesis.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenFastISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenGlobalISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenInstrInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenMCCodeEmitter.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenRegisterBank.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenRegisterInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/PowerPC/PPCGenSubtargetInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenAsmMatcher.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenAsmWriter.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenAsmWriter1.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenCallingConv.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenDAGISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenDisassemblerTables.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenEVEX2VEXTables.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenExegesis.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenFastISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenGlobalISel.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenInstrInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenRegisterBank.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenRegisterInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/Target/X86/X86GenSubtargetInfo.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/ToolDrivers/llvm-dlltool/Options.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/lib/ToolDrivers/llvm-lib/Options.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/dsymutil/Options.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-cvtres/Opts.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-lipo/LipoOpts.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-ml/Opts.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-mt/Opts.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-objcopy/BitcodeStripOpts.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-objcopy/InstallNameToolOpts.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-objcopy/ObjcopyOpts.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-objcopy/StripOpts.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-rc/Opts.inc
+  ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/tools/llvm-symbolizer/Opts.inc
+)
 add_custom_command(
   OUTPUT
   ${CMAKE_BINARY_DIR}/contrib/libs/llvm12/include/llvm/Frontend/OpenACC/ACC.h.inc

+ 4 - 0
contrib/libs/protobuf/CMakeLists.txt

@@ -110,6 +110,10 @@ target_include_directories(contrib-libs-protobuf.global PUBLIC
 target_include_directories(contrib-libs-protobuf.global PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
 )
+target_link_libraries(contrib-libs-protobuf.global PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+)
 target_sources(contrib-libs-protobuf.global PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src/google/protobuf/generated_message_util.cc
 )

+ 5 - 0
contrib/libs/tcmalloc/CMakeLists.txt

@@ -15,6 +15,11 @@ add_global_library_for(contrib-libs-tcmalloc.global contrib-libs-tcmalloc)
 target_compile_options(contrib-libs-tcmalloc.global PRIVATE
   -DTCMALLOC_256K_PAGES
 )
+target_link_libraries(contrib-libs-tcmalloc.global PUBLIC
+  contrib-libs-cxxsupp
+  contrib-restricted-abseil-cpp
+  libs-tcmalloc-malloc_extension
+)
 target_sources(contrib-libs-tcmalloc.global PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/tcmalloc/tcmalloc/tcmalloc.cc
   ${CMAKE_SOURCE_DIR}/contrib/libs/tcmalloc/tcmalloc/arena.cc

+ 7 - 0
library/cpp/blockcodecs/codecs/brotli/CMakeLists.txt

@@ -8,6 +8,13 @@ target_link_libraries(blockcodecs-codecs-brotli INTERFACE
 )
 
 add_global_library_for(blockcodecs-codecs-brotli.global blockcodecs-codecs-brotli)
+target_link_libraries(blockcodecs-codecs-brotli.global INTERFACE
+  contrib-libs-cxxsupp
+  yutil
+  libs-brotli-enc
+  libs-brotli-dec
+  cpp-blockcodecs-core
+)
 target_sources(blockcodecs-codecs-brotli.global PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/blockcodecs/codecs/brotli/brotli.cpp
 )

+ 6 - 0
library/cpp/blockcodecs/codecs/bzip/CMakeLists.txt

@@ -7,6 +7,12 @@ target_link_libraries(blockcodecs-codecs-bzip INTERFACE
 )
 
 add_global_library_for(blockcodecs-codecs-bzip.global blockcodecs-codecs-bzip)
+target_link_libraries(blockcodecs-codecs-bzip.global INTERFACE
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-libbz2
+  cpp-blockcodecs-core
+)
 target_sources(blockcodecs-codecs-bzip.global PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/blockcodecs/codecs/bzip/bzip.cpp
 )

+ 6 - 0
library/cpp/blockcodecs/codecs/fastlz/CMakeLists.txt

@@ -7,6 +7,12 @@ target_link_libraries(blockcodecs-codecs-fastlz INTERFACE
 )
 
 add_global_library_for(blockcodecs-codecs-fastlz.global blockcodecs-codecs-fastlz)
+target_link_libraries(blockcodecs-codecs-fastlz.global INTERFACE
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-fastlz
+  cpp-blockcodecs-core
+)
 target_sources(blockcodecs-codecs-fastlz.global PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/blockcodecs/codecs/fastlz/fastlz.cpp
 )

+ 6 - 0
library/cpp/blockcodecs/codecs/legacy_zstd06/CMakeLists.txt

@@ -7,6 +7,12 @@ target_link_libraries(blockcodecs-codecs-legacy_zstd06 INTERFACE
 )
 
 add_global_library_for(blockcodecs-codecs-legacy_zstd06.global blockcodecs-codecs-legacy_zstd06)
+target_link_libraries(blockcodecs-codecs-legacy_zstd06.global INTERFACE
+  contrib-libs-cxxsupp
+  yutil
+  contrib-libs-zstd06
+  cpp-blockcodecs-core
+)
 target_sources(blockcodecs-codecs-legacy_zstd06.global PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/blockcodecs/codecs/legacy_zstd06/legacy_zstd06.cpp
 )

Some files were not shown because too many files changed in this diff