thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert special contribs and set folder manually for them until fixed

Browse Source
This commit is contained in:
Denis Glazachev 2021-10-17 23:10:01 +03:00
parent 68a08ffed9
commit 9de534f96c
6 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/find/cxx.cmake
View File

@ -50,6 +50,8 @@ endif ()
if (NOT HAVE_LIBCXX AND NOT MISSING_INTERNAL_LIBCXX_LIBRARY) if (NOT HAVE_LIBCXX AND NOT MISSING_INTERNAL_LIBCXX_LIBRARY)
set (LIBCXX_LIBRARY cxx) set (LIBCXX_LIBRARY cxx)
set (LIBCXXABI_LIBRARY cxxabi) set (LIBCXXABI_LIBRARY cxxabi)
add_subdirectory(contrib/libcxxabi-cmake)
add_subdirectory(contrib/libcxx-cmake)
# Exception handling library is embedded into libcxxabi. # Exception handling library is embedded into libcxxabi.

1
cmake/find/unwind.cmake
View File

@ -1,6 +1,7 @@
option (USE_UNWIND "Enable libunwind (better stacktraces)" ${ENABLE_LIBRARIES}) option (USE_UNWIND "Enable libunwind (better stacktraces)" ${ENABLE_LIBRARIES})
if (USE_UNWIND) if (USE_UNWIND)
add_subdirectory(contrib/libunwind-cmake)
set (UNWIND_LIBRARIES unwind) set (UNWIND_LIBRARIES unwind)
set (EXCEPTION_HANDLING_LIBRARY ${UNWIND_LIBRARIES}) set (EXCEPTION_HANDLING_LIBRARY ${UNWIND_LIBRARIES})

9
contrib/CMakeLists.txt vendored
View File

@ -21,15 +21,6 @@ endif()
set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL 1) set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL 1)
if (USE_INTERNAL_LIBCXX_LIBRARY AND NOT MISSING_INTERNAL_LIBCXX_LIBRARY)
add_subdirectory(libcxxabi-cmake)
add_subdirectory(libcxx-cmake)
endif ()
if (USE_UNWIND)
add_subdirectory(libunwind-cmake)
endif ()
add_subdirectory (abseil-cpp-cmake) add_subdirectory (abseil-cpp-cmake)
add_subdirectory (magic-enum-cmake) add_subdirectory (magic-enum-cmake)
add_subdirectory (boost-cmake) add_subdirectory (boost-cmake)

1
contrib/libcxx-cmake/CMakeLists.txt
View File

@ -47,6 +47,7 @@ set(SRCS
) )
add_library(cxx ${SRCS}) add_library(cxx ${SRCS})
set_target_properties(cxx PROPERTIES FOLDER "contrib/libcxx-cmake")
target_include_directories(cxx SYSTEM BEFORE PUBLIC $<BUILD_INTERFACE:${LIBCXX_SOURCE_DIR}/include>) target_include_directories(cxx SYSTEM BEFORE PUBLIC $<BUILD_INTERFACE:${LIBCXX_SOURCE_DIR}/include>)
target_compile_definitions(cxx PRIVATE -D_LIBCPP_BUILDING_LIBRARY -DLIBCXX_BUILDING_LIBCXXABI) target_compile_definitions(cxx PRIVATE -D_LIBCPP_BUILDING_LIBRARY -DLIBCXX_BUILDING_LIBCXXABI)

1
contrib/libcxxabi-cmake/CMakeLists.txt
View File

@ -22,6 +22,7 @@ set(SRCS
) )
add_library(cxxabi ${SRCS}) add_library(cxxabi ${SRCS})
set_target_properties(cxxabi PROPERTIES FOLDER "contrib/libcxxabi-cmake")
# Third party library may have substandard code. # Third party library may have substandard code.
target_compile_options(cxxabi PRIVATE -w) target_compile_options(cxxabi PRIVATE -w)

1
contrib/libunwind-cmake/CMakeLists.txt
View File

@ -39,6 +39,7 @@ set(LIBUNWIND_SOURCES
${LIBUNWIND_ASM_SOURCES}) ${LIBUNWIND_ASM_SOURCES})
add_library(unwind ${LIBUNWIND_SOURCES}) add_library(unwind ${LIBUNWIND_SOURCES})
set_target_properties(unwind PROPERTIES FOLDER "contrib/libunwind-cmake")
target_include_directories(unwind SYSTEM BEFORE PUBLIC $<BUILD_INTERFACE:${LIBUNWIND_SOURCE_DIR}/include>) target_include_directories(unwind SYSTEM BEFORE PUBLIC $<BUILD_INTERFACE:${LIBUNWIND_SOURCE_DIR}/include>)
target_compile_definitions(unwind PRIVATE -D_LIBUNWIND_NO_HEAP=1 -D_DEBUG -D_LIBUNWIND_IS_NATIVE_ONLY) target_compile_definitions(unwind PRIVATE -D_LIBUNWIND_NO_HEAP=1 -D_DEBUG -D_LIBUNWIND_IS_NATIVE_ONLY)