thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 16:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

openssl to link with krb5

Browse Source
This commit is contained in:
Ilya Golshtein 2020-07-29 01:34:31 +03:00
parent 09bf3dc0d8
commit ff92812ac5
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/find/krb5.cmake
View File

@ -15,11 +15,10 @@ if (ENABLE_KRB5)
set (USE_KRB5 1) set (USE_KRB5 1)
set (KRB5_LIBRARY krb5) set (KRB5_LIBRARY krb5)
set (KRB5_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/krb5/include") set (KRB5_INCLUDE_DIR
list (APPEND KRB5_INCLUDE_DIR
"${ClickHouse_SOURCE_DIR}/contrib/krb5/src/include" "${ClickHouse_SOURCE_DIR}/contrib/krb5/src/include"
) "${ClickHouse_BINARY_DIR}/contrib/krb5-cmake/include"
)
endif () endif ()

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

@ -557,10 +557,10 @@ add_custom_target(
VERBATIM VERBATIM
) )
add_library(krb5) add_library(${KRB5_LIBRARY})
add_dependencies( add_dependencies(
krb5 ${KRB5_LIBRARY}
ERRMAP_H ERRMAP_H
ERROR_MAP_H ERROR_MAP_H
KRB_5_H KRB_5_H
@ -574,7 +574,7 @@ add_custom_command(
WORKING_DIRECTORY "${KRB5_SOURCE_DIR}/lib/gssapi/generic" WORKING_DIRECTORY "${KRB5_SOURCE_DIR}/lib/gssapi/generic"
) )
target_sources(krb5 PRIVATE target_sources(${KRB5_LIBRARY} PRIVATE
${ALL_SRCS} ${ALL_SRCS}
) )
@ -627,12 +627,12 @@ add_custom_command(
target_include_directories(krb5 PUBLIC target_include_directories(${KRB5_LIBRARY} PUBLIC
${KRB5_SOURCE_DIR}/include ${KRB5_SOURCE_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_BINARY_DIR}/include
) )
target_include_directories(krb5 PRIVATE target_include_directories(${KRB5_LIBRARY} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR} #for autoconf.h ${CMAKE_CURRENT_SOURCE_DIR} #for autoconf.h
${KRB5_SOURCE_DIR} ${KRB5_SOURCE_DIR}
${KRB5_SOURCE_DIR}/include ${KRB5_SOURCE_DIR}/include
@ -652,10 +652,10 @@ target_include_directories(krb5 PRIVATE
${KRB5_SOURCE_DIR}/lib/krb5/rcache ${KRB5_SOURCE_DIR}/lib/krb5/rcache
${KRB5_SOURCE_DIR}/lib/krb5/unicode ${KRB5_SOURCE_DIR}/lib/krb5/unicode
${KRB5_SOURCE_DIR}/lib/krb5/os ${KRB5_SOURCE_DIR}/lib/krb5/os
${OPENSSL_INCLUDE_DIR} # ${OPENSSL_INCLUDE_DIR}
) )
target_compile_definitions(krb5 PRIVATE target_compile_definitions(${KRB5_LIBRARY} PRIVATE
KRB5_PRIVATE KRB5_PRIVATE
_GSS_STATIC_LINK=1 _GSS_STATIC_LINK=1
KRB5_DEPRECATED=1 KRB5_DEPRECATED=1
@ -664,3 +664,7 @@ target_compile_definitions(krb5 PRIVATE
SBINDIR="/usr/local/sbin" SBINDIR="/usr/local/sbin"
LIBDIR="/usr/local/lib" LIBDIR="/usr/local/lib"
) )
target_link_libraries(${KRB5_LIBRARY}
PRIVATE ${OPENSSL_CRYPTO_LIBRARY}
)