Skip to content

Commit

Permalink
Add some trash
Browse files Browse the repository at this point in the history
  • Loading branch information
alesapin committed Sep 3, 2024
1 parent c9133e5 commit bb3d83e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ include (GNUInstallDirs)
add_library(global-group INTERFACE)
if (ARCH_LINUX)
include(cmake/linux/default_libs.cmake)
#target_link_options(global-group INTERFACE "LINKER:--no-undefined")
target_link_options(global-group INTERFACE "LINKER:--no-undefined")
else()
link_libraries(global-group)
endif()
Expand Down
6 changes: 3 additions & 3 deletions contrib/openssl-cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,14 @@ if(NOT ARCH_S390X)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld") # only relevant for -DENABLE_OPENSSL_DYNAMIC=1
endif()

if(ARCH_AMD64)
if(ARCH_LINUX)
if(OS_DARWIN)
set(OPENSSL_SYSTEM "macosx")
else()
macro(perl_generate_asm FILE_IN FILE_OUT)
# Manually set $CC because the called Perl scripts require it.
add_custom_command(OUTPUT ${FILE_OUT}
COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_CXX_COMPILER}" /usr/bin/env perl ${FILE_IN} ${FILE_OUT})
COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_CXX_COMPILER}" mkdir -p `dirname ${FILE_OUT}` && /usr/bin/env perl ${FILE_IN} ${FILE_OUT})
endmacro()

perl_generate_asm(${OPENSSL_SOURCE_DIR}/crypto/aes/asm/aes-x86_64.pl ${OPENSSL_BINARY_DIR}/crypto/aes/aes-x86_64.s)
Expand Down Expand Up @@ -1174,7 +1174,7 @@ if(NOT ENABLE_OPENSSL_DYNAMIC)
)
endif()

if(ARCH_AMD64)
if(ARCH_LINUX)
if (OS_DARWIN)
set(CRYPTO_SRC ${CRYPTO_SRC}
${OPENSSL_SOURCE_DIR}/crypto/aes/aes_cbc.c
Expand Down
2 changes: 2 additions & 0 deletions driver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,8 @@ endif ()

target_link_libraries (${libname}-impl
PUBLIC Poco::Net
PUBLIC OpenSSL::SSL
PUBLIC OpenSSL::Crypto
PUBLIC Poco::Net::SSL
PUBLIC Poco::Util
PUBLIC Poco::Foundation
Expand Down

0 comments on commit bb3d83e

Please sign in to comment.