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

Fix error

Browse Source
This commit is contained in:
Alexey Milovidov 2021-11-23 02:17:53 +03:00
parent a31abc2264
commit 1e057d51c1
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/find/libgsasl.cmake
View File

@ -30,7 +30,7 @@ if (LIBGSASL_LIBRARY AND LIBGSASL_INCLUDE_DIR)
elseif (NOT MISSING_INTERNAL_LIBGSASL_LIBRARY) elseif (NOT MISSING_INTERNAL_LIBGSASL_LIBRARY)
set (LIBGSASL_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libgsasl/src" "${ClickHouse_SOURCE_DIR}/contrib/libgsasl/linux_x86_64/include") set (LIBGSASL_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libgsasl/src" "${ClickHouse_SOURCE_DIR}/contrib/libgsasl/linux_x86_64/include")
set (USE_INTERNAL_LIBGSASL_LIBRARY 1) set (USE_INTERNAL_LIBGSASL_LIBRARY 1)
set (LIBGSASL_LIBRARY libgsasl) set (LIBGSASL_LIBRARY gsasl)
endif () endif ()
if(LIBGSASL_LIBRARY AND LIBGSASL_INCLUDE_DIR) if(LIBGSASL_LIBRARY AND LIBGSASL_INCLUDE_DIR)

2
contrib/CMakeLists.txt vendored
View File

@ -190,7 +190,7 @@ if (USE_EMBEDDED_COMPILER)
endif () endif ()
if (USE_INTERNAL_LIBGSASL_LIBRARY) if (USE_INTERNAL_LIBGSASL_LIBRARY)
add_subdirectory(libgsasl) add_subdirectory(libgsasl-cmake)
endif() endif()
if (USE_INTERNAL_LIBXML2_LIBRARY) if (USE_INTERNAL_LIBXML2_LIBRARY)

18
contrib/libgsasl-cmake/CMakeLists.txt
View File

@ -91,15 +91,17 @@ if (USE_KRB5)
${SRC_DIR}/gssapi/server.c) ${SRC_DIR}/gssapi/server.c)
endif() endif()
add_library(libgsasl ${SRCS}) add_library(gsasl ${SRCS})
target_include_directories(libgsasl PUBLIC ${SRC_DIR}) target_include_directories(gsasl PUBLIC ${SRC_DIR})
target_include_directories(libgsasl PUBLIC ${SRC_DIR}/gl) target_include_directories(gsasl PUBLIC ${SRC_DIR}/gl)
target_include_directories(libgsasl PUBLIC ${SRC_DIR}/src) target_include_directories(gsasl PUBLIC ${SRC_DIR}/src)
target_include_directories(libgsasl PUBLIC ${SRC_DIR}/digest-md5) target_include_directories(gsasl PUBLIC ${SRC_DIR}/digest-md5)
target_include_directories(libgsasl PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libgsasl-cmake/linux_x86_64/include") target_include_directories(gsasl PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libgsasl-cmake/linux_x86_64/include")
target_compile_definitions (gsasl PRIVATE HAVE_CONFIG_H=1)
if (USE_KRB5) if (USE_KRB5)
target_link_libraries(libgsasl PUBLIC ${KRB5_LIBRARY}) target_link_libraries(gsasl PUBLIC ${KRB5_LIBRARY})
target_compile_definitions (libgsasl PRIVATE WITH_KRB5=1 HAVE_GSSAPI_H=1 USE_GSSAPI=1 USE_KERBEROS_V5=1) target_compile_definitions (gsasl PRIVATE HAVE_GSSAPI_H=1 USE_GSSAPI=1)
endif() endif()