mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 00:30:49 +00:00
Cmake: some fixes
This commit is contained in:
parent
7ecfbfe53a
commit
33347ad9c3
@ -125,12 +125,12 @@ if (NOT APPLE)
|
|||||||
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GLIBC_COMPATIBILITY_LINK_FLAGS} ${CXX11_ABI_FLAGS}")
|
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GLIBC_COMPATIBILITY_LINK_FLAGS} ${CXX11_ABI_FLAGS}")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (USE_STATIC_LIBRARIES AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
include (cmake/test_compiler.cmake)
|
||||||
|
if (USE_STATIC_LIBRARIES AND HAVE_NO_PIE)
|
||||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --no-pie")
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --no-pie")
|
||||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --no-pie")
|
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --no-pie")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
|
||||||
set (SAN_FLAGS "-O3 -g -fno-omit-frame-pointer")
|
set (SAN_FLAGS "-O3 -g -fno-omit-frame-pointer")
|
||||||
set (CMAKE_CXX_FLAGS_ASAN "${CMAKE_CXX_FLAGS_ASAN} ${SAN_FLAGS} -fsanitize=address")
|
set (CMAKE_CXX_FLAGS_ASAN "${CMAKE_CXX_FLAGS_ASAN} ${SAN_FLAGS} -fsanitize=address")
|
||||||
set (CMAKE_C_FLAGS_ASAN "${CMAKE_C_FLAGS_ASAN} ${SAN_FLAGS} -fsanitize=address")
|
set (CMAKE_C_FLAGS_ASAN "${CMAKE_C_FLAGS_ASAN} ${SAN_FLAGS} -fsanitize=address")
|
||||||
|
@ -5,12 +5,13 @@ if (NOT READLINE_LIB)
|
|||||||
find_library (READLINE_LIB NAMES readline PATHS ${READLINE_PATHS})
|
find_library (READLINE_LIB NAMES readline PATHS ${READLINE_PATHS})
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
find_library (TERMCAP_LIB NAMES termcap)
|
list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .so.2)
|
||||||
|
|
||||||
|
find_library (TERMCAP_LIB NAMES termcap)
|
||||||
find_library (EDIT_LIB NAMES edit)
|
find_library (EDIT_LIB NAMES edit)
|
||||||
|
|
||||||
set(READLINE_INCLUDE_PATHS "/usr/local/opt/readline/include")
|
set(READLINE_INCLUDE_PATHS "/usr/local/opt/readline/include")
|
||||||
if (READLINE_LIB)
|
if (READLINE_LIB AND TERMCAP_LIB)
|
||||||
find_path (READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS ${READLINE_INCLUDE_PATHS} NO_DEFAULT_PATH)
|
find_path (READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS ${READLINE_INCLUDE_PATHS} NO_DEFAULT_PATH)
|
||||||
if (NOT READLINE_INCLUDE_DIR)
|
if (NOT READLINE_INCLUDE_DIR)
|
||||||
find_path (READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS ${READLINE_INCLUDE_PATHS})
|
find_path (READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS ${READLINE_INCLUDE_PATHS})
|
||||||
@ -40,5 +41,6 @@ check_cxx_source_runs("
|
|||||||
int main() {
|
int main() {
|
||||||
add_history(nullptr);
|
add_history(nullptr);
|
||||||
append_history(1,nullptr);
|
append_history(1,nullptr);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
" HAVE_READLINE_HISTORY)
|
" HAVE_READLINE_HISTORY)
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
if (APPLE)
|
if (APPLE)
|
||||||
find_library (RT_LIBRARIES apple_rt)
|
# lib from libs/libcommon
|
||||||
|
set (RT_LIBRARIES "apple_rt")
|
||||||
else ()
|
else ()
|
||||||
find_library (RT_LIBRARIES rt)
|
find_library (RT_LIBRARIES rt)
|
||||||
endif ()
|
endif ()
|
||||||
|
11
cmake/test_compiler.cmake
Normal file
11
cmake/test_compiler.cmake
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
include (CheckCXXSourceCompiles)
|
||||||
|
|
||||||
|
set (TEST_FLAG "--no-pie")
|
||||||
|
set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG}")
|
||||||
|
check_cxx_source_compiles("
|
||||||
|
int main() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
" HAVE_NO_PIE)
|
||||||
|
|
||||||
|
set (CMAKE_REQUIRED_FLAGS "")
|
Loading…
Reference in New Issue
Block a user