diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-08-18 16:49:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 16:49:57 -0700 |
| commit | 547af512d0f79864faaed927fa2d2e7c9b89a526 (patch) | |
| tree | 79cddfd23c198a4cac7fdd6830845dde40f3308c /ports/openssl-uwp | |
| parent | 4a3d9e22d1b104332c5faf98abfcee94b671c9ef (diff) | |
| download | vcpkg-547af512d0f79864faaed927fa2d2e7c9b89a526.tar.gz vcpkg-547af512d0f79864faaed927fa2d2e7c9b89a526.zip | |
[openssl] Interrupt the build process when files conflict (#12867)
Diffstat (limited to 'ports/openssl-uwp')
| -rw-r--r-- | ports/openssl-uwp/CONTROL | 1 | ||||
| -rw-r--r-- | ports/openssl-uwp/portfile.cmake | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ports/openssl-uwp/CONTROL b/ports/openssl-uwp/CONTROL index ccb3fb1e9..d82bb6455 100644 --- a/ports/openssl-uwp/CONTROL +++ b/ports/openssl-uwp/CONTROL @@ -1,4 +1,5 @@ Source: openssl-uwp Version: 1.1.1g +Port-Version: 1 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: uwp diff --git a/ports/openssl-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake index d8e2301de..e601742aa 100644 --- a/ports/openssl-uwp/portfile.cmake +++ b/ports/openssl-uwp/portfile.cmake @@ -1,9 +1,7 @@ vcpkg_fail_port_install(MESSAGE "${PORT} is only for Windows Universal Platform" ON_TARGET "Linux" "OSX") if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") - message(WARNING "Can't build openssl if libressl is installed. Please remove libressl, and try install openssl again if you need it. Build will continue but there might be problems since libressl is only a subset of openssl") - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - return() + message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.") endif() vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) |