diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-02-08 21:30:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-08 21:30:16 -0800 |
| commit | a0338581c6f43650af09371c7f4f128ad56ca271 (patch) | |
| tree | f6f111d97cf7b40a7f0bb4db293299af89e35a89 | |
| parent | 1ea7914d3a2412c2daa7cfe32f0534793b566cf5 (diff) | |
| download | vcpkg-a0338581c6f43650af09371c7f4f128ad56ca271.tar.gz vcpkg-a0338581c6f43650af09371c7f4f128ad56ca271.zip | |
[openssl-unix] Remove incomplete zlib dependency. Fix cmake wrapper to use more compatible cmake directives. (#9974)
| -rw-r--r-- | ports/openssl-unix/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ports/openssl-unix/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openssl-unix/vcpkg-cmake-wrapper.cmake | 12 |
3 files changed, 8 insertions, 7 deletions
diff --git a/ports/openssl-unix/CMakeLists.txt b/ports/openssl-unix/CMakeLists.txt index c3203cb91..98020c8cf 100644 --- a/ports/openssl-unix/CMakeLists.txt +++ b/ports/openssl-unix/CMakeLists.txt @@ -118,6 +118,7 @@ add_custom_command( COMMAND "${PERL}" Configure
${SHARED}
enable-static-engine
+ no-zlib
no-ssl2
no-idea
no-bf
diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL index c56c95dad..ad275dd34 100644 --- a/ports/openssl-unix/CONTROL +++ b/ports/openssl-unix/CONTROL @@ -1,4 +1,4 @@ Source: openssl-unix -Version: 1.1.1d-1 +Version: 1.1.1d-2 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. Supports: !(windows|uwp)
\ No newline at end of file diff --git a/ports/openssl-unix/vcpkg-cmake-wrapper.cmake b/ports/openssl-unix/vcpkg-cmake-wrapper.cmake index 044bc7b79..43e84cb02 100644 --- a/ports/openssl-unix/vcpkg-cmake-wrapper.cmake +++ b/ports/openssl-unix/vcpkg-cmake-wrapper.cmake @@ -8,11 +8,11 @@ if(OPENSSL_FOUND) endif()
endif()
find_package(Threads REQUIRED)
- find_package(ZLIB REQUIRED)
list(APPEND OPENSSL_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
- list(APPEND OPENSSL_LIBRARIES ${ZLIB_LIBRARIES})
- target_link_libraries(OpenSSL::Crypto INTERFACE Threads::Threads)
- target_link_libraries(OpenSSL::SSL INTERFACE Threads::Threads)
- target_link_libraries(OpenSSL::Crypto INTERFACE ZLIB::ZLIB)
- target_link_libraries(OpenSSL::SSL INTERFACE ZLIB::ZLIB)
+ if(TARGET OpenSSL::Crypto)
+ set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads")
+ endif()
+ if(TARGET OpenSSL::SSL)
+ set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads")
+ endif()
endif()
|