[rollup:2021-08-09] Rollup PR (#19469)

* [rollup:2021-08-09] PR #16706 (@JackBoosY)

[vcpkg_fixup_cmake_targets] Fix up OSX system development path

* [rollup:2021-08-09] PR #19238 (@strega-nil)

[scripts-audit] vcpkg_download_distfile

* [rollup:2021-08-09] PR #19239 (@strega-nil)

[scripts-audit] vcpkg_find_fortran

* [rollup:2021-08-09] PR #19338 (@strega-nil)

[tinyfiledialogs] Fix for good

* [rollup:2021-08-09] PR #19348 (@strega-nil)

[scripts-audit] vcpkg_fixup_pkgconfig

* fix ports.cmake with newer vcpkg_download_distfile

* fix vcpkg create

* move vcpkg_common_definitions down so that it's not incorrect

* fix vcpkg_internal_get_cmake_vars

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

1 files changed, 64 insertions, 66 deletions

diff --git a/scripts/ports.cmake b/scripts/ports.cmake
index 03547edff..e33fa5865 100644
--- a/scripts/ports.cmake
+++ b/scripts/ports.cmake
@@ -1,8 +1,64 @@
-# rebuild: 1
 cmake_minimum_required(VERSION 3.21)
 
 set(SCRIPTS "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Location to stored scripts")
+list(APPEND CMAKE_MODULE_PATH "${SCRIPTS}/cmake")
+include("${SCRIPTS}/cmake/execute_process.cmake")
+include("${SCRIPTS}/cmake/vcpkg_acquire_msys.cmake")
+include("${SCRIPTS}/cmake/vcpkg_add_to_path.cmake")
+include("${SCRIPTS}/cmake/vcpkg_apply_patches.cmake")
+include("${SCRIPTS}/cmake/vcpkg_build_cmake.cmake")
+include("${SCRIPTS}/cmake/vcpkg_build_make.cmake")
+include("${SCRIPTS}/cmake/vcpkg_build_msbuild.cmake")
+include("${SCRIPTS}/cmake/vcpkg_build_ninja.cmake")
+include("${SCRIPTS}/cmake/vcpkg_build_nmake.cmake")
+include("${SCRIPTS}/cmake/vcpkg_build_qmake.cmake")
+include("${SCRIPTS}/cmake/vcpkg_buildpath_length_warning.cmake")
+include("${SCRIPTS}/cmake/vcpkg_check_features.cmake")
+include("${SCRIPTS}/cmake/vcpkg_check_linkage.cmake")
+include("${SCRIPTS}/cmake/vcpkg_clean_executables_in_bin.cmake")
+include("${SCRIPTS}/cmake/vcpkg_clean_msbuild.cmake")
+include("${SCRIPTS}/cmake/vcpkg_configure_cmake.cmake")
+include("${SCRIPTS}/cmake/vcpkg_configure_gn.cmake")
+include("${SCRIPTS}/cmake/vcpkg_configure_make.cmake")
+include("${SCRIPTS}/cmake/vcpkg_configure_meson.cmake")
+include("${SCRIPTS}/cmake/vcpkg_configure_qmake.cmake")
+include("${SCRIPTS}/cmake/vcpkg_copy_pdbs.cmake")
+include("${SCRIPTS}/cmake/vcpkg_copy_tool_dependencies.cmake")
+include("${SCRIPTS}/cmake/vcpkg_copy_tools.cmake")
+include("${SCRIPTS}/cmake/vcpkg_download_distfile.cmake")
+include("${SCRIPTS}/cmake/vcpkg_execute_build_process.cmake")
+include("${SCRIPTS}/cmake/vcpkg_execute_required_process.cmake")
+include("${SCRIPTS}/cmake/vcpkg_execute_required_process_repeat.cmake")
+include("${SCRIPTS}/cmake/vcpkg_extract_source_archive.cmake")
+include("${SCRIPTS}/cmake/vcpkg_extract_source_archive_ex.cmake")
+include("${SCRIPTS}/cmake/vcpkg_fail_port_install.cmake")
+include("${SCRIPTS}/cmake/vcpkg_find_acquire_program.cmake")
+include("${SCRIPTS}/cmake/vcpkg_fixup_cmake_targets.cmake")
+include("${SCRIPTS}/cmake/vcpkg_fixup_pkgconfig.cmake")
+include("${SCRIPTS}/cmake/vcpkg_from_bitbucket.cmake")
+include("${SCRIPTS}/cmake/vcpkg_from_git.cmake")
+include("${SCRIPTS}/cmake/vcpkg_from_github.cmake")
+include("${SCRIPTS}/cmake/vcpkg_from_gitlab.cmake")
+include("${SCRIPTS}/cmake/vcpkg_from_sourceforge.cmake")
+include("${SCRIPTS}/cmake/vcpkg_get_program_files_platform_bitness.cmake")
+include("${SCRIPTS}/cmake/vcpkg_get_windows_sdk.cmake")
+include("${SCRIPTS}/cmake/vcpkg_install_cmake.cmake")
+include("${SCRIPTS}/cmake/vcpkg_install_gn.cmake")
+include("${SCRIPTS}/cmake/vcpkg_install_make.cmake")
+include("${SCRIPTS}/cmake/vcpkg_install_meson.cmake")
+include("${SCRIPTS}/cmake/vcpkg_install_msbuild.cmake")
+include("${SCRIPTS}/cmake/vcpkg_install_nmake.cmake")
+include("${SCRIPTS}/cmake/vcpkg_install_qmake.cmake")
+include("${SCRIPTS}/cmake/vcpkg_list.cmake")
+include("${SCRIPTS}/cmake/vcpkg_minimum_required.cmake")
+include("${SCRIPTS}/cmake/vcpkg_replace_string.cmake")
+include("${SCRIPTS}/cmake/vcpkg_test_cmake.cmake")
+
+include("${SCRIPTS}/cmake/z_vcpkg_apply_patches.cmake")
+include("${SCRIPTS}/cmake/z_vcpkg_forward_output_variable.cmake")
 include("${SCRIPTS}/cmake/z_vcpkg_function_arguments.cmake")
+include("${SCRIPTS}/cmake/z_vcpkg_get_cmake_vars.cmake")
+include("${SCRIPTS}/cmake/z_vcpkg_prettify_command_line.cmake")
 
 function(debug_message)
     if(PORT_DEBUG)
@@ -24,9 +80,7 @@ else()
     set(Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL "WARNING")
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${SCRIPTS}/cmake")
-include("${SCRIPTS}/cmake/vcpkg_minimum_required.cmake")
-vcpkg_minimum_required(VERSION 2021-07-16)
+vcpkg_minimum_required(VERSION 2021-08-03)
 
 file(TO_CMAKE_PATH "${BUILDTREES_DIR}" BUILDTREES_DIR)
 file(TO_CMAKE_PATH "${PACKAGES_DIR}" PACKAGES_DIR)
@@ -82,61 +136,6 @@ if(CMD MATCHES "^BUILD$")
 
     set(TRIPLET_SYSTEM_ARCH "${VCPKG_TARGET_ARCHITECTURE}")
     include("${SCRIPTS}/cmake/vcpkg_common_definitions.cmake")
-    include("${SCRIPTS}/cmake/execute_process.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_acquire_msys.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_add_to_path.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_apply_patches.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_build_cmake.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_build_make.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_build_msbuild.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_build_ninja.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_build_nmake.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_build_qmake.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_buildpath_length_warning.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_check_features.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_check_linkage.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_clean_executables_in_bin.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_clean_msbuild.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_configure_cmake.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_configure_gn.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_configure_make.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_configure_meson.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_configure_qmake.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_copy_pdbs.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_copy_tool_dependencies.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_copy_tools.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_download_distfile.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_execute_build_process.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_execute_required_process.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_execute_required_process_repeat.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_extract_source_archive.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_extract_source_archive_ex.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_fail_port_install.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_find_acquire_program.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_fixup_cmake_targets.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_fixup_pkgconfig.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_from_bitbucket.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_from_git.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_from_github.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_from_gitlab.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_from_sourceforge.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_get_program_files_platform_bitness.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_get_windows_sdk.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_install_cmake.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_install_gn.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_install_make.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_install_meson.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_install_msbuild.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_install_nmake.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_install_qmake.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_list.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_replace_string.cmake")
-    include("${SCRIPTS}/cmake/vcpkg_test_cmake.cmake")
-
-    include("${SCRIPTS}/cmake/z_vcpkg_apply_patches.cmake")
-    include("${SCRIPTS}/cmake/z_vcpkg_forward_output_variable.cmake")
-    include("${SCRIPTS}/cmake/z_vcpkg_get_cmake_vars.cmake")
-    include("${SCRIPTS}/cmake/z_vcpkg_prettify_command_line.cmake")
 
     include("${CURRENT_PORT_DIR}/portfile.cmake")
     if(DEFINED PORT)
@@ -169,13 +168,12 @@ elseif(CMD MATCHES "^CREATE$")
         message(STATUS "Using pre-downloaded: ${NATIVE_DOWNLOAD_PATH}")
         message(STATUS "If this is not desired, delete the file and ${NATIVE_PORT_PATH}")
     else()
-        include(vcpkg_download_distfile)
-        set(_VCPKG_INTERNAL_NO_HASH_CHECK ON)
-        vcpkg_download_distfile(ARCHIVE
-            URLS "${URL}"
-            FILENAME "${FILENAME}"
-        )
-        set(_VCPKG_INTERNAL_NO_HASH_CHECK OFF)
+        message(STATUS "Downloading ${URL} -> ${FILENAME}...")
+        file(DOWNLOAD "${URL}" "${DOWNLOAD_PATH}" STATUS download_status)
+        list(GET download_status 0 status_code)
+        if(NOT "${download_status}" EQUAL "0")
+            message(FATAL_ERROR "Downloading ${URL}... Failed. Status: ${download_status}")
+        endif()
     endif()
     file(SHA512 "${DOWNLOAD_PATH}" SHA512)