The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[vcpkg-find-acquire-program] Handle PERL and NASM on non-windows

Browse Source
This commit is contained in:
Robert Schumacher 2018-03-13 11:35:19 -07:00
parent d8aed01655
commit 94360c2c65
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/openssl/portfile.cmake
View File

@ -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)

4
scripts/cmake/vcpkg_find_acquire_program.cmake
View File

@ -49,12 +49,16 @@ function(vcpkg_find_acquire_program VAR)
if(VAR MATCHES "PERL")
set(PROGNAME perl)
set(PATHS ${DOWNLOADS}/tools/perl/perl/bin)
set(BREW_PACKAGE_NAME "perl")
set(APT_PACKAGE_NAME "perl")
set(URL "http://strawberryperl.com/download/5.24.1.1/strawberry-perl-5.24.1.1-32bit-portable.zip")
set(ARCHIVE "strawberry-perl-5.24.1.1-32bit-portable.zip")
set(HASH a6e685ea24376f50db5f06c5b46075f1d3be25168fa1f27fa9b02e2ac017826cee62a2b43562f9b6c989337a231ba914416c110075457764de2d11f99d5e0f26)
elseif(VAR MATCHES "NASM")
set(PROGNAME nasm)
set(PATHS ${DOWNLOADS}/tools/nasm/nasm-2.12.02)
set(BREW_PACKAGE_NAME "nasm")
set(APT_PACKAGE_NAME "nasm")
set(URL
"http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip"
"http://mirrors.kodi.tv/build-deps/win32/nasm-2.12.02-win32.zip"