diff options
| author | grdowns <grdowns@microsoft.com> | 2019-06-28 17:32:12 -0700 |
|---|---|---|
| committer | grdowns <grdowns@microsoft.com> | 2019-06-28 17:32:12 -0700 |
| commit | e27fe911982284788e63f4a92339386554706a4b (patch) | |
| tree | e695af1d6733cea93a29adab73ff819430ff872e /ports/openssl-windows | |
| parent | 1586330395db0bfa14c40c4b1a8d4da6c8f7c5f7 (diff) | |
| parent | 62ed7c17318b4f46109c2de73b7584fb04e85720 (diff) | |
| download | vcpkg-e27fe911982284788e63f4a92339386554706a4b.tar.gz vcpkg-e27fe911982284788e63f4a92339386554706a4b.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into openssl-version-bump
Diffstat (limited to 'ports/openssl-windows')
| -rw-r--r-- | ports/openssl-windows/portfile.cmake | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ports/openssl-windows/portfile.cmake b/ports/openssl-windows/portfile.cmake index 21191681d..3506be9ab 100644 --- a/ports/openssl-windows/portfile.cmake +++ b/ports/openssl-windows/portfile.cmake @@ -1,12 +1,19 @@ +include(vcpkg_common_functions) + if(VCPKG_CMAKE_SYSTEM_NAME) message(FATAL_ERROR "This port is only for building openssl on Windows Desktop") endif() -include(vcpkg_common_functions) -set(OPENSSL_VERSION 1.0.2s) +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() +endif() vcpkg_find_acquire_program(PERL) +set(OPENSSL_VERSION 1.0.2s) + get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}") |