From 501e44e02c2dbb75b34c36ad4bbc9439d2486394 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Sat, 26 Sep 2020 05:10:38 -0700 Subject: [qt5-location] Rename vendored libs to avoid conflicts (#13451) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [qt5-location] Rename vendored libs to avoid conflicts * [qt5-location] Use upstream patch * [qt5-location] Replace / in patch url with %2F * Update ports/qt5-location/CONTROL * [assimp][irrxml] Remove outdated version of irrxml; redirect assimp at newer irrlicht * [assimp] Apply skipped patch irrlicht.patch Co-authored-by: Stefano Sinigardi Co-authored-by: Robert Schumacher Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- scripts/cmake/vcpkg_download_distfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index b2dd9d42c..a767bff83 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -56,7 +56,7 @@ function(vcpkg_download_distfile VAR) set(options SKIP_SHA512 SILENT_EXIT QUIET) set(oneValueArgs FILENAME SHA512) set(multipleValuesArgs URLS HEADERS) - cmake_parse_arguments(vcpkg_download_distfile "${options}" "${oneValueArgs}" "${multipleValuesArgs}" ${ARGN}) + cmake_parse_arguments(PARSE_ARGV 1 vcpkg_download_distfile "${options}" "${oneValueArgs}" "${multipleValuesArgs}") if(NOT DEFINED vcpkg_download_distfile_URLS) message(FATAL_ERROR "vcpkg_download_distfile requires a URLS argument.") @@ -164,7 +164,7 @@ function(vcpkg_download_distfile VAR) list(APPEND request_headers HTTPHEADER ${header}) endforeach() endif() - file(DOWNLOAD ${url} "${download_file_path_part}" STATUS download_status ${request_headers}) + file(DOWNLOAD "${url}" "${download_file_path_part}" STATUS download_status ${request_headers}) list(GET download_status 0 status_code) if (NOT "${status_code}" STREQUAL "0") message(STATUS "Downloading ${url}... Failed. Status: ${download_status}") -- cgit v1.2.3