mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-12-17 03:42:48 +00:00
d09c5c871b
* Fix build * cmake: fix cpuinfo * Fix includes after processors merge Conflicts: dbms/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp dbms/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp dbms/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp dbms/src/Processors/Formats/Impl/ProtobufRowOutputFormat.cpp * Fix build in gcc8 * fix test link * fix test link * Fix test link * link fix * Fix includes after processors merge 2 Conflicts: dbms/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp * Fix includes after processors merge 3 * link fix * Fix likely/unlikely conflict with cython * Fix conflict with protobuf/stubs/atomicops.h * remove unlikely.h * Fix macos build (do not use timer_t)
25 lines
1021 B
CMake
25 lines
1021 B
CMake
option(USE_INTERNAL_CPUINFO_LIBRARY "Set to FALSE to use system cpuinfo library instead of bundled" ${NOT_UNBUNDLED})
|
|
|
|
# Now we have no contrib/libcpuinfo, use from system.
|
|
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libcpuinfo/include")
|
|
#message (WARNING "submodule contrib/libcpuinfo is missing. to fix try run: \n git submodule update --init --recursive")
|
|
set (USE_INTERNAL_CPUINFO_LIBRARY 0)
|
|
set (MISSING_INTERNAL_CPUINFO_LIBRARY 1)
|
|
endif ()
|
|
|
|
if(NOT USE_INTERNAL_CPUINFO_LIBRARY)
|
|
find_library(CPUINFO_LIBRARY cpuinfo)
|
|
find_path(CPUINFO_INCLUDE_DIR NAMES cpuinfo.h PATHS ${CPUINFO_INCLUDE_PATHS})
|
|
endif()
|
|
|
|
if(CPUINFO_LIBRARY AND CPUINFO_INCLUDE_DIR)
|
|
set(USE_CPUINFO 1)
|
|
elseif(NOT MISSING_INTERNAL_CPUINFO_LIBRARY)
|
|
set(CPUINFO_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libcpuinfo/include)
|
|
set(USE_INTERNAL_CPUINFO_LIBRARY 1)
|
|
set(CPUINFO_LIBRARY cpuinfo)
|
|
set(USE_CPUINFO 1)
|
|
endif()
|
|
|
|
message(STATUS "Using cpuinfo=${USE_CPUINFO}: ${CPUINFO_INCLUDE_DIR} : ${CPUINFO_LIBRARY}")
|