diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-03-13 11:35:19 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-13 11:35:19 -0700 |
| commit | 94360c2c65c6b38844ee75890d2be4632cdb4514 (patch) | |
| tree | 199f9ef349587651036cfbd926c35db62700aa07 /ports | |
| parent | d8aed01655c991ee11264bca6b3db1afab1a8218 (diff) | |
| download | vcpkg-94360c2c65c6b38844ee75890d2be4632cdb4514.tar.gz vcpkg-94360c2c65c6b38844ee75890d2be4632cdb4514.zip | |
[vcpkg-find-acquire-program] Handle PERL and NASM on non-windows
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/openssl/portfile.cmake | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 97ea7b614..3d442ec9e 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -7,18 +7,8 @@ include(vcpkg_common_functions) set(OPENSSL_VERSION 1.0.2n) set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION}) -if(CMAKE_HOST_WIN32) - vcpkg_find_acquire_program(PERL) - vcpkg_find_acquire_program(NASM) -else() - find_program(PERL perl) - find_program(NASM nasm) - if(NOT PERL) - message(FATAL_ERROR "Could not find perl. Please install it through your system package manager.") - elseif(NOT NASM) - message(FATAL_ERROR "Could not find nasm. Please install it through your system package manager.") - endif() -endif() +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) |