diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-11-20 10:29:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 10:29:25 -0800 |
| commit | fdfe770571b3711bbc1c708e0ea95766b0bc8e51 (patch) | |
| tree | 4b70a928c78090278196f36694803433d8e664c5 /scripts/cmake/execute_process.cmake | |
| parent | 46068e8a37b41a7a0ba4f485a90d88d3a1071f33 (diff) | |
| download | vcpkg-fdfe770571b3711bbc1c708e0ea95766b0bc8e51.tar.gz vcpkg-fdfe770571b3711bbc1c708e0ea95766b0bc8e51.zip | |
[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>
Diffstat (limited to 'scripts/cmake/execute_process.cmake')
| -rw-r--r-- | scripts/cmake/execute_process.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cmake/execute_process.cmake b/scripts/cmake/execute_process.cmake index 97af4eea1..76a3d9a8b 100644 --- a/scripts/cmake/execute_process.cmake +++ b/scripts/cmake/execute_process.cmake @@ -3,7 +3,7 @@ ## Intercepts all calls to execute_process() inside portfiles and fails when Download Mode
## is enabled.
##
-## In order to execute a process in Download Mode call `_execute_process()` instead.
+## In order to execute a process in Download Mode call `vcpkg_execute_in_download_mode()` instead.
##
if (NOT DEFINED OVERRIDEN_EXECUTE_PROCESS)
set(OVERRIDEN_EXECUTE_PROCESS ON)
@@ -17,4 +17,4 @@ if (NOT DEFINED OVERRIDEN_EXECUTE_PROCESS) execute_process(${ARGV})
endmacro()
endif()
-endif()
\ No newline at end of file +endif()
|