Add crypto/bytestring with cmake

This commit is contained in:
kinichiro 2021-12-11 21:03:06 +09:00
parent b10ff615eb
commit 244fd5608f
2 changed files with 22 additions and 4 deletions

View File

@ -371,6 +371,9 @@ set(
buffer/buf_err.c buffer/buf_err.c
buffer/buf_str.c buffer/buf_str.c
buffer/buffer.c buffer/buffer.c
bytestring/bs_ber.c
bytestring/bs_cbb.c
bytestring/bs_cbs.c
camellia/cmll_cfb.c camellia/cmll_cfb.c
camellia/cmll_ctr.c camellia/cmll_ctr.c
camellia/cmll_ecb.c camellia/cmll_ecb.c
@ -989,6 +992,7 @@ target_include_directories(crypto_obj
. .
asn1 asn1
bn bn
bytestring
dsa dsa
ec ec
ecdh ecdh

View File

@ -1,9 +1,6 @@
set( set(
SSL_SRC SSL_SRC
bio_ssl.c bio_ssl.c
bs_ber.c
bs_cbb.c
bs_cbs.c
d1_both.c d1_both.c
d1_lib.c d1_lib.c
d1_pkt.c d1_pkt.c
@ -54,6 +51,13 @@ set(
tls13_server.c tls13_server.c
) )
set(
BS_SRC
bs_ber.c
bs_cbb.c
bs_cbs.c
)
add_library(ssl_obj OBJECT ${SSL_SRC}) add_library(ssl_obj OBJECT ${SSL_SRC})
target_include_directories(ssl_obj target_include_directories(ssl_obj
PRIVATE PRIVATE
@ -62,7 +66,17 @@ target_include_directories(ssl_obj
PUBLIC PUBLIC
../include) ../include)
add_library(ssl $<TARGET_OBJECTS:ssl_obj>) add_library(bs_obj OBJECT ${BS_SRC})
target_include_directories(bs_obj
PRIVATE
.
../include/compat)
if(BUILD_SHARED_LIBS)
add_library(ssl $<TARGET_OBJECTS:ssl_obj> $<TARGET_OBJECTS:bs_obj>)
else()
add_library(ssl $<TARGET_OBJECTS:ssl_obj>)
endif()
export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym) export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym)
target_link_libraries(ssl crypto ${PLATFORM_LIBS}) target_link_libraries(ssl crypto ${PLATFORM_LIBS})