diff options
| author | Richard Levitte <richard@levitte.org> | 2021-08-18 09:12:40 +0200 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@users.noreply.github.com> | 2021-08-20 16:22:58 +0300 |
| commit | 5418695b897b03939a1c8db39557e8a5441e06a7 (patch) | |
| tree | 1ef18542703487bc04781132d90296457b208a99 | |
| parent | 1aac48068eca9316ec259af27e8a63260f24d473 (diff) | |
| download | gost-engine-5418695b897b03939a1c8db39557e8a5441e06a7.zip gost-engine-5418695b897b03939a1c8db39557e8a5441e06a7.tar.gz gost-engine-5418695b897b03939a1c8db39557e8a5441e06a7.tar.bz2 | |
Switch to using OpenSSL target names in CMakeLists.txt
Cmake 3.0 was a switch to using targets and properties rather than
variables when linking different components together.
We follow that philosophy by dropping ${OPENSSL_CRYPTO_LIBRARIES} and
${OPENSSL_SSL_LIBRARIES} in favor of OpenSSL::Crypto and OpenSSL::SSL.
(cherry picked from commit 36c50fa58c3cc1c5a30fd94aad77490e44abf022)
# Conflicts:
# CMakeLists.txt
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 21f5b19..af09f38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,7 +183,7 @@ set(GOST_ENGINE_SOURCE_FILES ) add_executable(test_digest test_digest.c) -target_link_libraries(test_digest ${OPENSSL_CRYPTO_LIBRARIES}) +target_link_libraries(test_digest OpenSSL::Crypto) add_test(NAME digest COMMAND test_digest) @@ -193,27 +193,27 @@ add_test(NAME curves COMMAND test_curves) add_executable(test_params test_params.c) -target_link_libraries(test_params ${OPENSSL_CRYPTO_LIBRARIES}) +target_link_libraries(test_params OpenSSL::Crypto) add_test(NAME parameters COMMAND test_params) add_executable(test_sign test_sign.c) -target_link_libraries(test_sign ${OPENSSL_CRYPTO_LIBRARIES}) +target_link_libraries(test_sign OpenSSL::Crypto) add_test(NAME sign/verify COMMAND test_sign) add_executable(test_tls test_tls.c) -target_link_libraries(test_tls ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES}) +target_link_libraries(test_tls OpenSSL::SSL) add_test(NAME TLS COMMAND test_tls) add_executable(test_context test_context.c) -target_link_libraries(test_context gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARIES}) +target_link_libraries(test_context gost_engine gost_core OpenSSL::Crypto) add_test(NAME context COMMAND test_context) add_executable(test_grasshopper test_grasshopper.c) -target_link_libraries(test_grasshopper gost_engine gost_core ${OPENSSL_CRYPTO_LIBRARY} dl z pthread) +target_link_libraries(test_grasshopper gost_engine gost_core OpenSSL::Crypto) add_test(NAME grasshopper COMMAND test_grasshopper) @@ -261,7 +261,7 @@ set_property(TARGET ${BINARY_TESTS_TARGETS} APPEND PROPERTY COMPILE_DEFINITIONS add_library(gost_core STATIC ${GOST_LIB_SOURCE_FILES}) set_target_properties(gost_core PROPERTIES POSITION_INDEPENDENT_CODE ON) -target_link_libraries(gost_core PRIVATE ${OPENSSL_CRYPTO_LIBRARIES}) +target_link_libraries(gost_core PRIVATE OpenSSL::Crypto) add_library(gost_engine SHARED ${GOST_ENGINE_SOURCE_FILES}) set_target_properties(gost_engine PROPERTIES PREFIX "" OUTPUT_NAME "gost") @@ -297,7 +297,7 @@ add_custom_target(tcl_tests WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tcl_tests) add_executable(test_tlstree test_tlstree.c) -target_link_libraries(test_tlstree PUBLIC ${OPENSSL_CRYPTO_LIBRARIES}) +target_link_libraries(test_tlstree PUBLIC OpenSSL::Crypto) # install set(OPENSSL_MAN_INSTALL_DIR ${CMAKE_INSTALL_MANDIR}/man1) |