diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-03-21 05:26:19 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-21 10:50:08 -0700 |
| commit | 9a0b2d19e32c793a9a1f0310be99af50ba211add (patch) | |
| tree | 5b826dd6b2a25cdff25f92b4c8dadd3571b11406 | |
| parent | 5442d35b9164b75101a57ede9c9dd119b92f18ff (diff) | |
| download | vcpkg-9a0b2d19e32c793a9a1f0310be99af50ba211add.tar.gz vcpkg-9a0b2d19e32c793a9a1f0310be99af50ba211add.zip | |
[openssl] Don't require nasm on non-windows
| -rw-r--r-- | ports/openssl/portfile-nonwindows.cmake | 3 | ||||
| -rw-r--r-- | ports/openssl/portfile.cmake | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ports/openssl/portfile-nonwindows.cmake b/ports/openssl/portfile-nonwindows.cmake index 67e739af1..3a4f69710 100644 --- a/ports/openssl/portfile-nonwindows.cmake +++ b/ports/openssl/portfile-nonwindows.cmake @@ -4,6 +4,9 @@ if(CMAKE_HOST_WIN32) set(MAKE ${MSYS_ROOT}/usr/bin/make.exe)
else()
find_program(MAKE make)
+ if(NOT MAKE)
+ message(FATAL_ERROR "Could not find make. Please install it through your package manager.")
+ endif()
endif()
vcpkg_configure_cmake(
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index dd92552f4..023b3e233 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -8,11 +8,9 @@ set(OPENSSL_VERSION 1.0.2n) set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION}) vcpkg_find_acquire_program(PERL) -vcpkg_find_acquire_program(NASM) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) -get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) -set(ENV{PATH} "${NASM_EXE_PATH};$ENV{PATH};${PERL_EXE_PATH}") +set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}") vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz" @@ -34,6 +32,10 @@ if(VCPKG_CMAKE_SYSTEM_NAME) return() endif() +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) +set(ENV{PATH} "${NASM_EXE_PATH};$ENV{PATH}") + vcpkg_find_acquire_program(JOM) set(CONFIGURE_COMMAND ${PERL} Configure |