aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2023-11-05 14:33:56 -0600
committerBrent Cook <busterb@gmail.com>2023-11-05 14:33:56 -0600
commit4830b1ee8e9bd32bf07962538d492088640b99de (patch)
tree9a5c0155b32e974d3e6655ac2e443e683141b078
parentba0adb9a2f8bc85b6a6ad451fed93c0cf04fdc42 (diff)
parent2c5abde778053272fdc0c5692691309e8f1e79b1 (diff)
downloadportable-4830b1ee8e9bd32bf07962538d492088640b99de.tar.gz
portable-4830b1ee8e9bd32bf07962538d492088640b99de.tar.bz2
portable-4830b1ee8e9bd32bf07962538d492088640b99de.zip
Land #932, use existing crypto/ssl libs for tls tests
-rw-r--r--CMakeLists.txt2
-rw-r--r--tls/CMakeLists.txt5
2 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca7f565..ec47fe8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -408,7 +408,7 @@ set(LIBTLS_LIBS tls ${PLATFORM_LIBS})
408# libraries for regression test 408# libraries for regression test
409if(BUILD_SHARED_LIBS) 409if(BUILD_SHARED_LIBS)
410 set(OPENSSL_TEST_LIBS ssl-static crypto-static ${PLATFORM_LIBS}) 410 set(OPENSSL_TEST_LIBS ssl-static crypto-static ${PLATFORM_LIBS})
411 set(LIBTLS_TEST_LIBS tls-static ${PLATFORM_LIBS}) 411 set(LIBTLS_TEST_LIBS tls-static ${OPENSSL_TEST_LIBS})
412else() 412else()
413 set(OPENSSL_TEST_LIBS ssl crypto ${PLATFORM_LIBS}) 413 set(OPENSSL_TEST_LIBS ssl crypto ${PLATFORM_LIBS})
414 set(LIBTLS_TEST_LIBS tls ${PLATFORM_LIBS}) 414 set(LIBTLS_TEST_LIBS tls ${PLATFORM_LIBS})
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 077f5ee..c3c9424 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -96,8 +96,7 @@ endif(ENABLE_LIBRESSL_INSTALL)
96 96
97# build static library for regression test 97# build static library for regression test
98if(BUILD_SHARED_LIBS) 98if(BUILD_SHARED_LIBS)
99 add_library(tls-static STATIC $<TARGET_OBJECTS:tls_obj> 99 add_library(tls-static STATIC $<TARGET_OBJECTS:tls_obj>)
100 $<TARGET_OBJECTS:ssl_obj> $<TARGET_OBJECTS:crypto_obj>) 100 target_link_libraries(tls-static ${OPENSSL_TEST_LIBS})
101 target_link_libraries(tls-static ${PLATFORM_LIBS})
102endif() 101endif()
103 102