diff options
| author | Andrei Lebedev <lebdron@gmail.com> | 2021-01-13 04:49:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 19:49:40 -0800 |
| commit | 557ecbe253f87d75c6914b9a522ea92fc15eb20f (patch) | |
| tree | 586be5cf9ce4988cb9dd37cfcb31435599da1849 /scripts | |
| parent | 8598a3d67db0ad1f662358508acec0fc49f2b0a4 (diff) | |
| download | vcpkg-557ecbe253f87d75c6914b9a522ea92fc15eb20f.tar.gz vcpkg-557ecbe253f87d75c6914b9a522ea92fc15eb20f.zip | |
[vcpkg] use VCPKG_ROOT_DIR instead of DOWNLOADS for WORKING_DIRECTORY in do_version_check (#15299)
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index f8fc6f6f4..cc6be6b3e 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -71,7 +71,7 @@ function(vcpkg_find_acquire_program VAR) set(PATHS ${DOWNLOADS}/tools/perl/${SUBDIR}/perl/bin) set(BREW_PACKAGE_NAME "perl") set(APT_PACKAGE_NAME "perl") - set(URL + set(URL "https://strawberry.perl.bot/download/${PERL_VERSION}/strawberry-perl-${PERL_VERSION}-32bit.zip" "http://strawberryperl.com/download/${PERL_VERSION}/strawberry-perl-${PERL_VERSION}-32bit.zip" ) @@ -300,7 +300,7 @@ function(vcpkg_find_acquire_program VAR) set(PROGNAME clang) set(SUBDIR "clang-10.0.0") if(CMAKE_HOST_WIN32) - set(PATHS + set(PATHS # Support LLVM in Visual Studio 2019 "$ENV{LLVMInstallDir}/x64/bin" "$ENV{LLVMInstallDir}/bin" @@ -314,7 +314,7 @@ function(vcpkg_find_acquire_program VAR) else() set(HOST_ARCH_ $ENV{PROCESSOR_ARCHITECTURE}) endif() - + if(HOST_ARCH_ MATCHES "64") set(URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe") set(ARCHIVE "LLVM-10.0.0-win64.7z.exe") @@ -360,7 +360,7 @@ function(vcpkg_find_acquire_program VAR) set(SCRIPTNAME "scons.py") set(URL "https://sourceforge.net/projects/scons/files/scons-local-${SCONS_VERSION}.zip/download") set(ARCHIVE "scons-local-${SCONS_VERSION}.zip") - set(HASH fe121b67b979a4e9580c7f62cfdbe0c243eba62a05b560d6d513ac7f35816d439b26d92fc2d7b7d7241c9ce2a49ea7949455a17587ef53c04a5f5125ac635727) + set(HASH fe121b67b979a4e9580c7f62cfdbe0c243eba62a05b560d6d513ac7f35816d439b26d92fc2d7b7d7241c9ce2a49ea7949455a17587ef53c04a5f5125ac635727) elseif(VAR MATCHES "SWIG") set(SWIG_VERSION 4.0.2) set(PROGNAME swig) @@ -468,7 +468,7 @@ function(vcpkg_find_acquire_program VAR) if(VERSION_CMD) vcpkg_execute_in_download_mode( COMMAND ${${VAR}} ${VERSION_CMD} - WORKING_DIRECTORY ${DOWNLOADS} + WORKING_DIRECTORY ${VCPKG_ROOT_DIR} OUTPUT_VARIABLE ${VAR}_VERSION_OUTPUT ) string(STRIP "${${VAR}_VERSION_OUTPUT}" ${VAR}_VERSION_OUTPUT) @@ -481,7 +481,7 @@ function(vcpkg_find_acquire_program VAR) endif() endif() endmacro() - + macro(do_find) if(NOT DEFINED REQUIRED_INTERPRETER) find_program(${VAR} ${PROGNAME} PATHS ${PATHS} NO_DEFAULT_PATH) |