Skip to content
Snippets Groups Projects
Commit 2559a521 authored by Feodor Alexandrov's avatar Feodor Alexandrov Committed by Dmitry Ivanov
Browse files

rename: crypto to tcrypto

Picodata is built statically, and name crypto clashes between
`src/lib/crypto` and libcrypto from `openssl`. To resolve the
ambiguity this patch renames tarantool library to `tcrypto`.

NO_DOC=picodata internal patch
NO_CHANGELOG=picodata internal patch
NO_TEST=picodata internal patch
parent 436e2fc7
No related branches found
No related tags found
No related merge requests found
......@@ -300,7 +300,7 @@ set_source_files_compile_flags(${server_sources})
add_library(server STATIC ${server_sources})
add_dependencies(server build_bundled_libs)
target_link_libraries(server core coll http_parser bit uri swim swim_udp
swim_ev crypto mpstream crc32 tzcode)
swim_ev tcrypto mpstream crc32 tzcode)
if(EMBED_LUAZLIB)
target_link_libraries(server ${ZLIB_LIBRARIES})
......
set(lib_sources crypto.c)
set_source_files_compile_flags(${lib_sources})
add_library(crypto STATIC ${lib_sources})
target_link_libraries(crypto ${OPENSSL_LIBRARIES} core)
add_library(tcrypto STATIC ${lib_sources})
target_link_libraries(tcrypto ${OPENSSL_LIBRARIES} core)
if (ENABLE_BUNDLED_OPENSSL)
add_dependencies(crypto bundled-openssl)
add_dependencies(tcrypto bundled-openssl)
endif()
......@@ -5,7 +5,7 @@ set(lib_swim_ev_sources swim_ev.c)
set_source_files_compile_flags(${lib_swim_sources} ${lib_swim_udp_sources}
${lib_swim_ev_sources})
add_library(swim STATIC ${lib_swim_sources})
target_link_libraries(swim core misc crypto)
target_link_libraries(swim core misc tcrypto)
add_library(swim_udp STATIC ${lib_swim_udp_sources})
target_link_libraries(swim_udp core)
add_library(swim_ev STATIC ${lib_swim_ev_sources})
......
......@@ -466,7 +466,7 @@ create_unit_test(PREFIX sio
create_unit_test(PREFIX crypto
SOURCES crypto.c core_test_utils.c
LIBRARIES crypto unit
LIBRARIES tcrypto unit
)
create_unit_test(PREFIX swim
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment