mirror of
https://github.com/pocoproject/poco.git
synced 2025-03-03 12:58:03 +01:00
fix: OpenSSL: Need to add openssl/applink.c to Windows executables using OpenSSL #4864
This commit is contained in:
parent
ca969f9ec3
commit
605baa13d2
@ -216,12 +216,18 @@ option(POCO_UNBUNDLED
|
||||
if(ENABLE_TESTS)
|
||||
include(CTest)
|
||||
enable_testing()
|
||||
message(STATUS "Building with unittests & samples")
|
||||
message(STATUS "Building with unit tests")
|
||||
if(ENABLE_TEST_DEPRECATED)
|
||||
add_compile_definitions(POCO_TEST_DEPRECATED)
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "Building without tests & samples")
|
||||
message(STATUS "Building without unit tests")
|
||||
endif()
|
||||
|
||||
if(ENABLE_SAMPLES)
|
||||
message(STATUS "Building with samples")
|
||||
else()
|
||||
message(STATUS "Building without samples")
|
||||
endif()
|
||||
|
||||
if(ENABLE_FUZZING)
|
||||
|
@ -1,2 +1,5 @@
|
||||
add_executable(genrsakey src/genrsakey.cpp)
|
||||
target_link_libraries(genrsakey PUBLIC Poco::Crypto Poco::Util Poco::XML)
|
||||
if(MSVC)
|
||||
target_link_libraries(genrsakey PRIVATE OpenSSL::applink)
|
||||
endif()
|
||||
|
@ -26,6 +26,9 @@ else()
|
||||
set_tests_properties(Crypto PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
|
||||
endif()
|
||||
target_link_libraries(Crypto-testrunner PUBLIC Poco::NetSSL Poco::XML CppUnit)
|
||||
if(MSVC)
|
||||
target_link_libraries(Crypto-testrunner PRIVATE OpenSSL::applink)
|
||||
endif()
|
||||
if(UNIX AND NOT ANDROID)
|
||||
target_link_libraries(Crypto-testrunner PUBLIC pthread)
|
||||
endif(UNIX AND NOT ANDROID)
|
||||
|
@ -9,11 +9,6 @@
|
||||
|
||||
|
||||
#include "Poco/Platform.h"
|
||||
// see https://www.openssl.org/docs/faq.html
|
||||
// and https://github.com/openssl/openssl/blob/master/doc/man3/OPENSSL_Applink.pod
|
||||
#if defined(POCO_OS_FAMILY_WINDOWS) && defined(OPENSSL_REQUIRE_APPLINK)
|
||||
#include "openssl/applink.c"
|
||||
#endif
|
||||
#include "CryptoTestSuite.h"
|
||||
#include "CryptoTest.h"
|
||||
#include "RSATest.h"
|
||||
|
@ -26,6 +26,9 @@ else()
|
||||
set_tests_properties(JWT PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
|
||||
endif()
|
||||
target_link_libraries(JWT-testrunner PUBLIC Poco::JWT Poco::Crypto CppUnit)
|
||||
if(MSVC)
|
||||
target_link_libraries(JWT-testrunner PRIVATE OpenSSL::applink)
|
||||
endif()
|
||||
if(UNIX AND NOT ANDROID)
|
||||
target_link_libraries(JWT-testrunner PUBLIC pthread)
|
||||
endif(UNIX AND NOT ANDROID)
|
||||
|
@ -1,2 +1,5 @@
|
||||
add_executable(HTTPSTimeServer src/HTTPSTimeServer.cpp)
|
||||
target_link_libraries(HTTPSTimeServer PUBLIC Poco::NetSSL Poco::Util Poco::XML)
|
||||
if(MSVC)
|
||||
target_link_libraries(HTTPSTimeServer PRIVATE OpenSSL::applink)
|
||||
endif()
|
||||
|
@ -1,2 +1,5 @@
|
||||
add_executable(Mail-ssl src/Mail.cpp)
|
||||
target_link_libraries(Mail-ssl PUBLIC Poco::NetSSL Poco::Util Poco::XML)
|
||||
if(MSVC)
|
||||
target_link_libraries(Mail-ssl PRIVATE OpenSSL::applink)
|
||||
endif()
|
||||
|
@ -1,5 +1,5 @@
|
||||
add_executable(SetSourceIP src/SetSourceIP.cpp)
|
||||
target_link_libraries(SetSourceIP PUBLIC Poco::NetSSL Poco::Crypto Poco::Util Poco::Net Poco::XML Poco::Foundation)
|
||||
# uncomment following line, might solve compiling issues
|
||||
#set(CMAKE_CXX_STANDARD 11)
|
||||
|
||||
if(MSVC)
|
||||
target_link_libraries(SetSourceIP PRIVATE OpenSSL::applink)
|
||||
endif()
|
||||
|
@ -3,3 +3,6 @@ add_executable(TwitterCLient
|
||||
src/Twitter.cpp
|
||||
)
|
||||
target_link_libraries(TwitterCLient PUBLIC Poco::NetSSL Poco::Util Poco::JSON Poco::XML)
|
||||
if(MSVC)
|
||||
target_link_libraries(TwitterClient PRIVATE OpenSSL::applink)
|
||||
endif()
|
@ -1,2 +1,5 @@
|
||||
add_executable(download-ssl src/download.cpp)
|
||||
target_link_libraries(download-ssl PUBLIC Poco::NetSSL Poco::Util Poco::XML)
|
||||
if(MSVC)
|
||||
target_link_libraries(download-ssl PRIVATE OpenSSL::applink)
|
||||
endif()
|
@ -35,7 +35,9 @@ else()
|
||||
)
|
||||
endif()
|
||||
target_link_libraries(NetSSL-testrunner PUBLIC Poco::NetSSL Poco::Util Poco::XML CppUnit)
|
||||
|
||||
if(MSVC)
|
||||
target_link_libraries(NetSSL-testrunner PRIVATE OpenSSL::applink)
|
||||
endif()
|
||||
|
||||
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/ping/websocket-server.cpp)
|
||||
add_executable(NetSSL-server ping/websocket-server.cpp)
|
||||
|
Loading…
x
Reference in New Issue
Block a user