diff --git a/contrib/boost-cmake/CMakeLists.txt b/contrib/boost-cmake/CMakeLists.txt index 59deea802cf..712aa7cdac0 100644 --- a/contrib/boost-cmake/CMakeLists.txt +++ b/contrib/boost-cmake/CMakeLists.txt @@ -152,78 +152,78 @@ if (NOT EXTERNAL_BOOST_FOUND) SET(ASM_OPTIONS "-x assembler-with-cpp") set (SRCS_CONTEXT - ${LIBRARY_DIR}/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_arm64_aapcs_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_arm_aapcs_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_arm_aapcs_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_arm_aapcs_pe_armasm.asm - ${LIBRARY_DIR}/libs/context/src/asm/jump_combined_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_i386_ms_pe_gas.asm - ${LIBRARY_DIR}/libs/context/src/asm/jump_i386_ms_pe_masm.asm - ${LIBRARY_DIR}/libs/context/src/asm/jump_i386_sysv_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_i386_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_i386_x86_64_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_mips32_o32_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_mips64_n64_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc32_ppc64_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc32_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc32_sysv_xcoff_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc64_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc64_sysv_xcoff_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_ms_pe_gas.asm - ${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_ms_pe_masm.asm +# ${LIBRARY_DIR}/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_arm64_aapcs_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_arm_aapcs_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_arm_aapcs_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_arm_aapcs_pe_armasm.asm +# ${LIBRARY_DIR}/libs/context/src/asm/jump_combined_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_i386_ms_pe_gas.asm +# ${LIBRARY_DIR}/libs/context/src/asm/jump_i386_ms_pe_masm.asm +# ${LIBRARY_DIR}/libs/context/src/asm/jump_i386_sysv_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_i386_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_i386_x86_64_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_mips32_o32_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_mips64_n64_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc32_ppc64_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc32_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc32_sysv_xcoff_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc64_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_ppc64_sysv_xcoff_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_ms_pe_gas.asm +# ${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_ms_pe_masm.asm ${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_arm_aapcs_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_arm_aapcs_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_arm_aapcs_pe_armasm.asm - ${LIBRARY_DIR}/libs/context/src/asm/make_combined_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_i386_ms_pe_gas.asm - ${LIBRARY_DIR}/libs/context/src/asm/make_i386_ms_pe_masm.asm - ${LIBRARY_DIR}/libs/context/src/asm/make_i386_sysv_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_i386_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_i386_x86_64_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_mips32_o32_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_mips64_n64_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_ppc32_ppc64_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_ppc32_sysv_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_ppc32_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_ppc32_sysv_xcoff_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_ppc64_sysv_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_ppc64_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_ppc64_sysv_xcoff_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_ms_pe_gas.asm - ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_ms_pe_masm.asm +# ${LIBRARY_DIR}/libs/context/src/asm/jump_x86_64_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_arm64_aapcs_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_arm_aapcs_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_arm_aapcs_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_arm_aapcs_pe_armasm.asm +# ${LIBRARY_DIR}/libs/context/src/asm/make_combined_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_i386_ms_pe_gas.asm +# ${LIBRARY_DIR}/libs/context/src/asm/make_i386_ms_pe_masm.asm +# ${LIBRARY_DIR}/libs/context/src/asm/make_i386_sysv_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_i386_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_i386_x86_64_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_mips32_o32_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_mips64_n64_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_ppc32_ppc64_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_ppc32_sysv_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_ppc32_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_ppc32_sysv_xcoff_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_ppc64_sysv_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_ppc64_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_ppc64_sysv_xcoff_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_ms_pe_gas.asm +# ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_ms_pe_masm.asm ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm64_aapcs_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm_aapcs_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm_aapcs_pe_armasm.asm - ${LIBRARY_DIR}/libs/context/src/asm/ontop_combined_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_i386_ms_pe_gas.asm - ${LIBRARY_DIR}/libs/context/src/asm/ontop_i386_ms_pe_masm.asm - ${LIBRARY_DIR}/libs/context/src/asm/ontop_i386_sysv_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_i386_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_i386_x86_64_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_mips32_o32_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_mips64_n64_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc32_ppc64_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc32_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc32_sysv_xcoff_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc64_sysv_macho_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc64_sysv_xcoff_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_ms_pe_gas.asm - ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_ms_pe_masm.asm +# ${LIBRARY_DIR}/libs/context/src/asm/make_x86_64_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm64_aapcs_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm_aapcs_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_arm_aapcs_pe_armasm.asm +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_combined_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_i386_ms_pe_gas.asm +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_i386_ms_pe_masm.asm +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_i386_sysv_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_i386_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_i386_x86_64_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_mips32_o32_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_mips64_n64_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc32_ppc64_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc32_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc32_sysv_xcoff_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc64_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_ppc64_sysv_xcoff_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_ms_pe_gas.asm +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_ms_pe_masm.asm ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S - ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_macho_gas.S +# ${LIBRARY_DIR}/libs/context/src/asm/ontop_x86_64_sysv_macho_gas.S ${LIBRARY_DIR}/libs/context/src/continuation.cpp ${LIBRARY_DIR}/libs/context/src/dummy.cpp ${LIBRARY_DIR}/libs/context/src/execution_context.cpp diff --git a/src/Interpreters/tests/CMakeLists.txt b/src/Interpreters/tests/CMakeLists.txt index 9bdedc7b76b..f8fa33d8d2e 100644 --- a/src/Interpreters/tests/CMakeLists.txt +++ b/src/Interpreters/tests/CMakeLists.txt @@ -30,7 +30,7 @@ add_executable (string_hash_map_aggregation string_hash_map.cpp) target_link_libraries (string_hash_map_aggregation PRIVATE dbms) add_executable (context context.cpp) -target_link_libraries (context PRIVATE dbms) +target_link_libraries (context PRIVATE dbms _boost_context) add_executable (two_level_hash_map two_level_hash_map.cpp) target_include_directories (two_level_hash_map SYSTEM BEFORE PRIVATE ${SPARSEHASH_INCLUDE_DIR})