From 4ef352347413114702f34e5c7dcbfeef28c61e93 Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Fri, 21 Mar 2025 10:39:33 -0700
Subject: [PATCH] Support FILENAME with / in vcpkg_download_distfile.

As requested by @Neumann-A

Manual tests:

vcpkg_download_distfile(SOURCE_PATH URLS https://example.com/ SHA512 d06b93c883f8126a04589937a884032df031b05518eed9d433efb6447834df2596aebd500d69b8283e5702d988ed49655ae654c1683c7a4ae58bfa6b92f2b73a FILENAME "subdir/a/b/c/file.txt")

made "C:\Dev\vcpkg-downloads\subdir\a\b\c\file.txt"

Edited that file to something else on purpose, and reran. It made "C:\Dev\vcpkg-downloads\subdir\a\b\c\file-d06b93c8.txt"
---
 scripts/cmake/vcpkg_download_distfile.cmake | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake
index a82d178097694f..723612b8461461 100644
--- a/scripts/cmake/vcpkg_download_distfile.cmake
+++ b/scripts/cmake/vcpkg_download_distfile.cmake
@@ -47,6 +47,13 @@ If you do not know the SHA512, add it as 'SHA512 0' and retry.")
 
     set(downloaded_file_path "${DOWNLOADS}/${arg_FILENAME}")
 
+    # We can assume DOWNLOADS already exists if we are running, but `arg_FILENAME` may have /s in it
+    # where the caller expects subdirectories to be created.
+    get_filename_component(directory_component "${arg_FILENAME}" DIRECTORY)
+    if (NOT "${directory_component}" STREQUAL "")
+        file(MAKE_DIRECTORY "${DOWNLOADS}/${directory_component}")
+    endif()
+
     if(EXISTS "${downloaded_file_path}")
         if(arg_SKIP_SHA512)
             if(NOT arg_ALWAYS_REDOWNLOAD)
@@ -70,9 +77,12 @@ If you do not know the SHA512, add it as 'SHA512 0' and retry.")
             # into the file name and try again to hopefully not conflict.
             get_filename_component(filename_component "${arg_FILENAME}" NAME_WE)
             get_filename_component(extension_component "${arg_FILENAME}" EXT)
-            get_filename_component(directory_component "${arg_FILENAME}" DIRECTORY)
             string(SUBSTRING "${arg_SHA512}" 0 8 hash)
-            set(arg_FILENAME "${directory_component}${filename_component}-${hash}${extension_component}")
+            set(arg_FILENAME "${filename_component}-${hash}${extension_component}")
+            if (NOT "${directory_component}" STREQUAL "")
+                set(arg_FILENAME "${directory_component}/${arg_FILENAME}")
+            endif()
+
             set(downloaded_file_path "${DOWNLOADS}/${arg_FILENAME}")
             if(EXISTS "${downloaded_file_path}")
                 if(_VCPKG_NO_DOWNLOADS)
@@ -104,7 +114,7 @@ If you do not know the SHA512, add it as 'SHA512 0' and retry.")
         message(FATAL_ERROR "Downloads are disabled, but '${downloaded_file_path}' does not exist.")
     endif()
 
-    vcpkg_list(SET params "x-download" "${downloaded_file_path}")
+    vcpkg_list(SET params "x-download" "${arg_FILENAME}")
     foreach(url IN LISTS arg_URLS)
         vcpkg_list(APPEND params "--url=${url}")
     endforeach()
@@ -119,7 +129,9 @@ If you do not know the SHA512, add it as 'SHA512 0' and retry.")
         vcpkg_list(APPEND params "--sha512=${arg_SHA512}")
     endif()
 
-    vcpkg_execute_in_download_mode(COMMAND "$ENV{VCPKG_COMMAND}" ${params} RESULT_VARIABLE error_code)
+    # Setting WORKING_DIRECTORY and passing the relative FILENAME allows vcpkg x-download to print
+    # the full relative path if FILENAME has /s in it.
+    vcpkg_execute_in_download_mode(COMMAND "$ENV{VCPKG_COMMAND}" ${params} RESULT_VARIABLE error_code WORKING_DIRECTORY "${DOWNLOADS}")
     if(NOT "${error_code}" EQUAL "0")
         message(FATAL_ERROR "Download failed, halting portfile.")
     endif()