diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2021-07-23 13:11:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 22:11:45 -0700 |
| commit | 92bbf7b3315172d63ffa58416e7cf3f05d8da8e6 (patch) | |
| tree | da6c63b6294d7e0a8219c40345428b38a45cca15 /ports/openssl/unix | |
| parent | 8cda3938f5f03a7961cc8024f83829e0f83176d2 (diff) | |
| download | vcpkg-92bbf7b3315172d63ffa58416e7cf3f05d8da8e6.tar.gz vcpkg-92bbf7b3315172d63ffa58416e7cf3f05d8da8e6.zip | |
[openssl] Fix vcpkg-cmake-wrapper.cmake (#18475)
* [openssl] Fix vcpkg-cmake-wrapper.cmake
* Update baseline revision
* Update the wrapper
* Update the baseline
* Update the wrapper
* Update the baseline
* Update the wrapper
* Update the baseline
* Update the wrapper
* Update the baseline
* Update the wrapper
* Update the baseline
* Update the wrapper
* Update the baseline
* Bump port-version.
* Update the baseline version
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/openssl/unix')
| -rw-r--r-- | ports/openssl/unix/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/openssl/unix/vcpkg-cmake-wrapper.cmake | 18 |
2 files changed, 0 insertions, 22 deletions
diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake index 912234925..f051fd639 100644 --- a/ports/openssl/unix/portfile.cmake +++ b/ports/openssl/unix/portfile.cmake @@ -43,7 +43,3 @@ endforeach() file(INSTALL ${RESOLVED_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/openssl) file(INSTALL ${MASTER_COPY_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl) -endif() diff --git a/ports/openssl/unix/vcpkg-cmake-wrapper.cmake b/ports/openssl/unix/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 43e84cb02..000000000 --- a/ports/openssl/unix/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,18 +0,0 @@ -_find_package(${ARGS})
-if(OPENSSL_FOUND)
- find_library(OPENSSL_DL_LIBRARY NAMES dl)
- if(OPENSSL_DL_LIBRARY)
- list(APPEND OPENSSL_LIBRARIES "dl")
- if(TARGET OpenSSL::Crypto)
- set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "dl")
- endif()
- endif()
- find_package(Threads REQUIRED)
- list(APPEND OPENSSL_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
- 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()
|