[gdal] Update to 3.1.3 (#13449)

* [vcpkg_*_nmake] Add option INSTALL_COMMAND

* [gdal] Update to 3.1.3 and switch to vcpkg_*_nmake on Windows

* [vcpkg_build_make] Add option MAKEFILE

* fix install on windows, fix linux build

* fix options position

* [gdal] Fix linux build

* [gdal] Fix expat library name

* [gdal] Fix geos library name

* [gdal] Fix cmake wrapper

* [pdal] Fix dependency geos

* [pdal] Fix PDALConfig.cmake

* [gdal] Fix dependency cfitsio on *inx

* disable cfitsio temporary

* [gdal] Correct cmake wrapper and usage

* [gdal] Fix tools on windows-static

* Revert a9ac823007975485aacc7e1f3eb4053e295376e1

* Apply suggestions

* [vcpkg_build_nmake] Fix install command

* [vcpkg_build_nmake] Fix install command

* regenerate docs

* [gdal] Update dependency iconv and charset library names

* [gdal] add json-c as a dependency on non-windows

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>

17 files changed, 174 insertions, 12 deletions

diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md
index 887311127..943afa6e7 100644
--- a/docs/maintainers/portfile-functions.md
+++ b/docs/maintainers/portfile-functions.md
@@ -1,5 +1,5 @@
-<!-- Run regenerate.ps1 to extract documentation from scripts\cmake\*.cmake -->

-

+<!-- Run regenerate.ps1 to extract documentation from scripts\cmake\*.cmake -->
+
 # Portfile helper functions

 - [execute\_process](execute_process.md)

 - [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md)

@@ -21,15 +21,17 @@
 - [vcpkg\_configure\_make](vcpkg_configure_make.md)

 - [vcpkg\_configure\_meson](vcpkg_configure_meson.md)

 - [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md)

-- [vcpkg\_copy\_tools](vcpkg_copy_tools.md)

 - [vcpkg\_copy\_tool\_dependencies](vcpkg_copy_tool_dependencies.md)

+- [vcpkg\_copy\_tools](vcpkg_copy_tools.md)

 - [vcpkg\_download\_distfile](vcpkg_download_distfile.md)

 - [vcpkg\_execute\_build\_process](vcpkg_execute_build_process.md)

+- [vcpkg\_execute\_in\_download\_mode](vcpkg_execute_in_download_mode.md)

 - [vcpkg\_execute\_required\_process](vcpkg_execute_required_process.md)

 - [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md)

 - [vcpkg\_extract\_source\_archive\_ex](vcpkg_extract_source_archive_ex.md)

 - [vcpkg\_fail\_port\_install](vcpkg_fail_port_install.md)

 - [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.md)

+- [vcpkg\_find\_fortran](vcpkg_find_fortran.md)

 - [vcpkg\_fixup\_cmake\_targets](vcpkg_fixup_cmake_targets.md)

 - [vcpkg\_fixup\_pkgconfig](vcpkg_fixup_pkgconfig.md)

 - [vcpkg\_from\_bitbucket](vcpkg_from_bitbucket.md)

@@ -44,4 +46,5 @@
 - [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md)

 - [vcpkg\_install\_nmake](vcpkg_install_nmake.md)

 - [vcpkg\_install\_qmake](vcpkg_install_qmake.md)

+- [vcpkg\_internal\_get\_cmake\_vars](vcpkg_internal_get_cmake_vars.md)

 - [vcpkg\_prettify\_command](vcpkg_prettify_command.md)

diff --git a/docs/maintainers/vcpkg_acquire_msys.md b/docs/maintainers/vcpkg_acquire_msys.md
index 4dc8f5391..5dd075a70 100644
--- a/docs/maintainers/vcpkg_acquire_msys.md
+++ b/docs/maintainers/vcpkg_acquire_msys.md
@@ -4,7 +4,11 @@ Download and prepare an MSYS2 instance.
 
 ## Usage
 ```cmake
-vcpkg_acquire_msys(<MSYS_ROOT_VAR> [PACKAGES <package>...])
+vcpkg_acquire_msys(<MSYS_ROOT_VAR>
+    PACKAGES <package>...
+    [NO_DEFAULT_PACKAGES]
+    [DIRECT_PACKAGES <URL> <SHA512> <URL> <SHA512> ...]
+)
 ```
 
 ## Parameters
@@ -14,7 +18,22 @@ An out-variable that will be set to the path to MSYS2.
 ### PACKAGES
 A list of packages to acquire in msys.
 
-To ensure a package is available: `vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15)`
+To ensure a package is available: `vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16)`
+
+### NO_DEFAULT_PACKAGES
+Exclude the normal base packages.
+
+The list of base packages includes: bash, coreutils, sed, grep, gawk, diffutils, make, and pkg-config
+
+### DIRECT_PACKAGES
+A list of URL/SHA512 pairs to acquire in msys.
+
+This parameter can be used by a port to privately extend the list of msys packages to be acquired.
+The URLs can be found on the msys2 website[1] and should be a direct archive link:
+
+    https://repo.msys2.org/mingw/i686/mingw-w64-i686-gettext-0.19.8.1-9-any.pkg.tar.zst
+
+[1] https://packages.msys2.org/search
 
 ## Notes
 A call to `vcpkg_acquire_msys` will usually be followed by a call to `bash.exe`:
diff --git a/docs/maintainers/vcpkg_build_make.md b/docs/maintainers/vcpkg_build_make.md
index 3332191d1..de44a84d4 100644
--- a/docs/maintainers/vcpkg_build_make.md
+++ b/docs/maintainers/vcpkg_build_make.md
@@ -7,6 +7,7 @@ Build a linux makefile project.
 vcpkg_build_make([BUILD_TARGET <target>]
                  [ADD_BIN_TO_PATH]
                  [ENABLE_INSTALL])
+                 [MAKEFILE <makefileName>]
                  [LOGFILE_ROOT <logfileroot>])
 ```
 
@@ -20,10 +21,19 @@ Adds the appropriate Release and Debug `bin\` directories to the path during the
 ### ENABLE_INSTALL
 IF the port supports the install target use vcpkg_install_make() instead of vcpkg_build_make()
 
+### MAKEFILE
+Specifies the Makefile as a relative path from the root of the sources passed to `vcpkg_configure_make()`
+
 ### BUILD_TARGET
 The target passed to the make build command (`./make <target>`). If not specified, the 'all' target will
 be passed.
 
+### DISABLE_PARALLEL
+The underlying buildsystem will be instructed to not parallelize
+
+### SUBPATH
+Additional subdir to invoke make in. Useful if only parts of a port should be built. 
+
 ## Notes:
 This command should be preceeded by a call to [`vcpkg_configure_make()`](vcpkg_configure_make.md).
 You can use the alias [`vcpkg_install_make()`](vcpkg_configure_make.md) function if your CMake script supports the
diff --git a/docs/maintainers/vcpkg_build_nmake.md b/docs/maintainers/vcpkg_build_nmake.md
index c9f4cc5d9..1daa0717f 100644
--- a/docs/maintainers/vcpkg_build_nmake.md
+++ b/docs/maintainers/vcpkg_build_nmake.md
@@ -7,6 +7,7 @@ Build a msvc makefile project.
 vcpkg_build_nmake(
     SOURCE_PATH <${SOURCE_PATH}>
     [NO_DEBUG]
+    [TARGET <all>]
     [PROJECT_SUBPATH <${SUBPATH}>]
     [PROJECT_NAME <${MAKEFILE_NAME}>]
     [PRERUN_SHELL <${SHELL_PATH}>]
diff --git a/docs/maintainers/vcpkg_check_linkage.md b/docs/maintainers/vcpkg_check_linkage.md
index eb20e97c8..406325dba 100644
--- a/docs/maintainers/vcpkg_check_linkage.md
+++ b/docs/maintainers/vcpkg_check_linkage.md
@@ -28,7 +28,7 @@ This command will either alter the settings for `VCPKG_LIBRARY_LINKAGE` or fail,
 
 ## Examples
 
-* [abseil](https://github.com/Microsoft/vcpkg/blob/master/ports/abseil/portfile.cmake)
+* [libimobiledevice](https://github.com/Microsoft/vcpkg/blob/master/ports/libimobiledevice/portfile.cmake)
 
 ## Source
-[scripts/cmake/vcpkg_check_linkage.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_linkage.cmake)
+[scripts/cmake/vcpkg_check_linkage.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_linkage.cmake)

diff --git a/docs/maintainers/vcpkg_common_definitions.md b/docs/maintainers/vcpkg_common_definitions.md
index 21b05aa1d..9c16deba3 100644
--- a/docs/maintainers/vcpkg_common_definitions.md
+++ b/docs/maintainers/vcpkg_common_definitions.md
@@ -5,6 +5,7 @@ File contains helpful variabls for portfiles which are commonly needed or used.
 ## The following variables are available:
 ```cmake
 VCPKG_TARGET_IS_<target>                 with <target> being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD. only defined if <target>
+VCPKG_HOST_IS_<target>                   with <host> being one of the following: WINDOWS, LINUX, OSX, FREEBSD. only defined if <host>
 VCPKG_HOST_PATH_SEPARATOR                Host specific path separator (USAGE: "<something>${VCPKG_HOST_PATH_SEPARATOR}<something>"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "")
 VCPKG_HOST_EXECUTABLE_SUFFIX             executable suffix of the host
 VCPKG_TARGET_EXECUTABLE_SUFFIX           executable suffix of the target
diff --git a/docs/maintainers/vcpkg_configure_cmake.md b/docs/maintainers/vcpkg_configure_cmake.md
index 00324dc1c..92e5dbb77 100644
--- a/docs/maintainers/vcpkg_configure_cmake.md
+++ b/docs/maintainers/vcpkg_configure_cmake.md
@@ -51,6 +51,9 @@ Additional options passed to CMake during the Release configuration. These are i
 ### OPTIONS_DEBUG
 Additional options passed to CMake during the Debug configuration. These are in addition to `OPTIONS`.
 
+### LOGNAME
+Name of the log to write the output of the configure call to.
+
 ## Notes
 This command supplies many common arguments to CMake. To see the full list, examine the source.
 
diff --git a/docs/maintainers/vcpkg_configure_make.md b/docs/maintainers/vcpkg_configure_make.md
index 43f7e45f1..6e7f6fa95 100644
--- a/docs/maintainers/vcpkg_configure_make.md
+++ b/docs/maintainers/vcpkg_configure_make.md
@@ -7,6 +7,13 @@ Configure configure for Debug and Release builds of a project.
 vcpkg_configure_make(
     SOURCE_PATH <${SOURCE_PATH}>
     [AUTOCONFIG]
+    [USE_WRAPPERS]
+    [DETERMINE_BUILD_TRIPLET]
+    [BUILD_TRIPLET "--host=x64 --build=i686-unknown-pc"]
+    [NO_ADDITIONAL_PATHS]
+    [CONFIG_DEPENDENT_ENVIRONMENT <SOME_VAR>...]
+    [CONFIGURE_ENVIRONMENT_VARIABLES <SOME_ENVVAR>...]
+    [ADD_BIN_TO_PATH]
     [NO_DEBUG]
     [SKIP_CONFIGURE]
     [PROJECT_SUBPATH <${PROJ_SUBPATH}>]
@@ -29,12 +36,30 @@ By convention, this is usually set in the portfile as the variable `SOURCE_PATH`
 ### SKIP_CONFIGURE
 Skip configure process
 
+### USE_WRAPPERS
+Use autotools ar-lib and compile wrappers (only applies to windows cl and lib)
+
+### BUILD_TRIPLET
+Used to pass custom --build/--target/--host to configure. Can be globally overwritten by VCPKG_MAKE_BUILD_TRIPLET
+
+### DETERMINE_BUILD_TRIPLET
+For ports having a configure script following the autotools rules for selecting the triplet
+
+### NO_ADDITIONAL_PATHS
+Don't pass any additional paths except for --prefix to the configure call
+
 ### AUTOCONFIG
 Need to use autoconfig to generate configure file.
 
 ### PRERUN_SHELL
 Script that needs to be called before configuration (do not use for batch files which simply call autoconf or configure)
 
+### ADD_BIN_TO_PATH
+Adds the appropriate Release and Debug `bin\` directories to the path during configure such that executables can run against the in-tree DLLs.
+
+## DISABLE_VERBOSE_FLAGS
+do not pass '--disable-silent-rules --verbose' to configure
+
 ### OPTIONS
 Additional options passed to configure during the configuration.
 
@@ -44,6 +69,14 @@ Additional options passed to configure during the Release configuration. These a
 ### OPTIONS_DEBUG
 Additional options passed to configure during the Debug configuration. These are in addition to `OPTIONS`.
 
+### CONFIG_DEPENDENT_ENVIRONMENT
+List of additional configuration dependent environment variables to set. 
+Pass SOMEVAR to set the environment and have SOMEVAR_(DEBUG|RELEASE) set in the portfile to the appropriate values
+General environment variables can be set from within the portfile itself. 
+
+### CONFIGURE_ENVIRONMENT_VARIABLES
+List of additional environment variables to pass via the configure call. 
+
 ## Notes
 This command supplies many common arguments to configure. To see the full list, examine the source.
 
diff --git a/docs/maintainers/vcpkg_download_distfile.md b/docs/maintainers/vcpkg_download_distfile.md
index 18bdf9dc7..36c9ff2c0 100644
--- a/docs/maintainers/vcpkg_download_distfile.md
+++ b/docs/maintainers/vcpkg_download_distfile.md
@@ -28,6 +28,9 @@ The expected hash for the file.
 
 If this doesn't match the downloaded version, the build will be terminated with a message describing the mismatch.
 
+### QUIET
+Suppress output on cache hit
+
 ### SKIP_SHA512
 Skip SHA512 hash check for file.
 
diff --git a/docs/maintainers/vcpkg_execute_in_download_mode.md b/docs/maintainers/vcpkg_execute_in_download_mode.md
new file mode 100644
index 000000000..0a7f8a8f7
--- /dev/null
+++ b/docs/maintainers/vcpkg_execute_in_download_mode.md
@@ -0,0 +1,29 @@
+# vcpkg_execute_in_download_mode
+
+Execute a process even in download mode.
+
+## Usage
+```cmake
+vcpkg_execute_in_download_mode(
+    COMMAND <cmd> [<arguments>...]
+    OUTPUT_QUIET ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE
+    WORKING_DIRECTORY <dir>
+    TIMEOUT <seconds>
+    RESULT_VARIABLE <seconds>
+    OUTPUT_VARIABLE <var_out>
+    ERROR_VARIABLE <var_err>
+    INPUT_FILE <f_in>
+    OUTPUT_FILE <f_out>
+    ERROR_FILE <f_err>
+    ENCODING <enc>
+)
+```
+
+The signature of this function is identical with `execute_process()` except that
+it only accepts one COMMAND argument, i.e., does not support chaining multiple
+commands with pipes.
+
+See `execute_process()` for a detailed description of the parameters.
+
+## Source
+[scripts/cmake/vcpkg_execute_in_download_mode.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_execute_in_download_mode.cmake)

diff --git a/docs/maintainers/vcpkg_execute_required_process.md b/docs/maintainers/vcpkg_execute_required_process.md
index 26a116782..1691f1792 100644
--- a/docs/maintainers/vcpkg_execute_required_process.md
+++ b/docs/maintainers/vcpkg_execute_required_process.md
@@ -8,6 +8,9 @@ vcpkg_execute_required_process(
     COMMAND <${PERL}> [<arguments>...]
     WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg>
     LOGNAME <build-${TARGET_TRIPLET}-dbg>
+    [TIMEOUT <seconds>]
+    [OUTPUT_VARIABLE <var>]
+    [ERROR_VARIABLE <var>]
 )
 ```
 ## Parameters
@@ -24,6 +27,15 @@ The directory to execute the command in.
 ### LOGNAME
 The prefix to use for the log files.
 
+### TIMEOUT
+Optional timeout after which to terminate the command.
+
+### OUTPUT_VARIABLE
+Optional variable to receive stdout of the command.
+
+### ERROR_VARIABLE
+Optional variable to receive stderr of the command.
+
 This should be a unique name for different triplets so that the logs don't conflict when building multiple at once.
 
 ## Examples
diff --git a/docs/maintainers/vcpkg_find_acquire_program.md b/docs/maintainers/vcpkg_find_acquire_program.md
index ae83ccb92..aef499b12 100644
--- a/docs/maintainers/vcpkg_find_acquire_program.md
+++ b/docs/maintainers/vcpkg_find_acquire_program.md
@@ -34,6 +34,7 @@ The current list of programs includes:
 - NINJA
 - NUGET
 - SCONS
+- SWIG
 - YASM
 
 Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_acquire_msys.md).
diff --git a/docs/maintainers/vcpkg_find_fortran.md b/docs/maintainers/vcpkg_find_fortran.md
new file mode 100644
index 000000000..eb04ebdf3
--- /dev/null
+++ b/docs/maintainers/vcpkg_find_fortran.md
@@ -0,0 +1,14 @@
+# vcpkg_find_fortran
+
+Checks if a Fortran compiler can be found.
+Windows(x86/x64) Only: If not it will switch/enable MinGW gfortran 
+                       and return required cmake args for building. 
+
+## Usage
+```cmake
+vcpkg_find_fortran(<additional_cmake_args_out>
+)
+```
+
+## Source
+[scripts/cmake/vcpkg_find_fortran.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_find_fortran.cmake)

diff --git a/docs/maintainers/vcpkg_fixup_pkgconfig.md b/docs/maintainers/vcpkg_fixup_pkgconfig.md
index 25c6aae5d..be77ae347 100644
--- a/docs/maintainers/vcpkg_fixup_pkgconfig.md
+++ b/docs/maintainers/vcpkg_fixup_pkgconfig.md
@@ -8,6 +8,8 @@ vcpkg_fixup_pkgconfig(
     [RELEASE_FILES <PATHS>...]
     [DEBUG_FILES <PATHS>...]
     [SYSTEM_LIBRARIES <NAMES>...]
+    [IGNORE_FLAGS <FLAGS>]
+    [SKIP_CHECK]
 )
 ```
 
@@ -20,10 +22,6 @@ Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR} without ${CURR
 Specifies a list of files to apply the fixes for debug paths.
 Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR}/debug/
 
-### SYSTEM_PACKAGES
-If the *.pc file contains system packages outside vcpkg these need to be listed here.
-Since vcpkg checks the existence of all required packages within vcpkg.
-
 ### SYSTEM_LIBRARIES
 If the *.pc file contains system libraries outside vcpkg these need to be listed here.
 VCPKG checks every -l flag for the existence of the required library within vcpkg.
@@ -31,11 +29,13 @@ VCPKG checks every -l flag for the existence of the required library within vcpk
 ### IGNORE_FLAGS
 If the *.pc file contains flags in the lib field which are not libraries. These can be listed here
 
+### SKIP_CHECK
+Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases. 
+
 ## Notes
 Still work in progress. If there are more cases which can be handled here feel free to add them
 
 ## Examples
-
 Just call vcpkg_fixup_pkgconfig() after any install step which installs *.pc files.
 
 ## Source
diff --git a/docs/maintainers/vcpkg_from_github.md b/docs/maintainers/vcpkg_from_github.md
index 18ab5b976..64ff2b195 100644
--- a/docs/maintainers/vcpkg_from_github.md
+++ b/docs/maintainers/vcpkg_from_github.md
@@ -55,6 +55,9 @@ This field should contain the scheme, host, and port of the desired URL without
 ### AUTHORIZATION_TOKEN
 A token to be passed via the Authorization HTTP header as "token ${AUTHORIZATION_TOKEN}".
 
+### FILE_DISAMBIGUATOR
+A token to uniquely identify the resulting filename if the SHA512 changes even though a git ref does not, to avoid stepping on the same file name.
+
 ## Notes:
 At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.
 
diff --git a/docs/maintainers/vcpkg_install_nmake.md b/docs/maintainers/vcpkg_install_nmake.md
index e83b05ff7..b1ff83ef8 100644
--- a/docs/maintainers/vcpkg_install_nmake.md
+++ b/docs/maintainers/vcpkg_install_nmake.md
@@ -7,6 +7,7 @@ Build and install a msvc makefile project.
 vcpkg_install_nmake(
     SOURCE_PATH <${SOURCE_PATH}>
     [NO_DEBUG]
+    [TARGET <all>]
     PROJECT_SUBPATH <${SUBPATH}>
     PROJECT_NAME <${MAKEFILE_NAME}>
     [PRERUN_SHELL <${SHELL_PATH}>]
diff --git a/docs/maintainers/vcpkg_internal_get_cmake_vars.md b/docs/maintainers/vcpkg_internal_get_cmake_vars.md
new file mode 100644
index 000000000..e2adfad74
--- /dev/null
+++ b/docs/maintainers/vcpkg_internal_get_cmake_vars.md
@@ -0,0 +1,29 @@
+# vcpkg_internal_get_cmake_vars
+
+**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.**
+Runs a cmake configure with a dummy project to extract certain cmake variables
+
+## Usage
+```cmake
+vcpkg_internal_get_cmake_vars(
+    [OUTPUT_FILE <output_file_with_vars>]
+    [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...]
+)
+```
+
+## Parameters
+### OPTIONS
+Additional options to pass to the test configure call 
+
+### OUTPUT_FILE
+Variable to return the path to the generated cmake file with the detected `CMAKE_` variables set as `VCKPG_DETECTED_`
+
+## Notes
+If possible avoid usage in portfiles. 
+
+## Examples
+
+* [vcpkg_configure_make](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_make.cmake)
+
+## Source
+[scripts/cmake/vcpkg_internal_get_cmake_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake)