[openssl] Don't require nasm on non-windows

microsoft · Mar 21, 2018 · 9a0b2d1 · 9a0b2d1
1 parent 5442d35
commit 9a0b2d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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