From d369df7ecf194005eaca46f07368779cd486badd Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Wed, 14 Jul 2021 14:45:18 -0500 Subject: [rollup:2021-07-06] Rollup PR (#18838) * [rollup:2021-07-06 1/8] PR #18272 (@strega-nil) [scripts-audit] vcpkg_from_* * [rollup:2021-07-06 2/8] PR #18319 (@strega-nil) [scripts-audit] add guidelines for cmake * [rollup 2021-07-06 3/8] PR #18410 (@mheyman) [vcpkg-cmake-config] documentation fix * [rollup:2021-07-06 4/8] PR #18488 (@strega-nil) [scripts-audit] vcpkg_execute_* * [rollup:2021-07-06 5/8] PR #18517 (@strega-nil) [scripts-audit] vcpkg_extract_source_archive * [rollup:2021-07-06 6/8] PR #18674 (@NancyLi1013) [vcpkg doc] Update examples * [rollup:2021-07-06 7/8] PR #18695 (@JackBoosY) [vcpkg] Update the minimum version of vcpkg * [rollup:2021-07-06 8/8] PR #18758 (@ras0219-msft) [vcpkg_from_git] Fix error if downloads folder does not exist * build docs! * fix bond:*-windows * fix nmap Co-authored-by: nicole mazzuca Co-authored-by: Michael Heyman Co-authored-by: NancyLi1013 Co-authored-by: JackBoosY Co-authored-by: Robert Schumacher --- scripts/cmake/execute_process.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts/cmake/execute_process.cmake') diff --git a/scripts/cmake/execute_process.cmake b/scripts/cmake/execute_process.cmake index 206bd95b1..be45604d6 100644 --- a/scripts/cmake/execute_process.cmake +++ b/scripts/cmake/execute_process.cmake @@ -14,5 +14,8 @@ if (NOT DEFINED Z_VCPKG_OVERRIDEN_EXECUTE_PROCESS) function(execute_process) message(FATAL_ERROR "This command cannot be executed in Download Mode.\nHalting portfile execution.\n") endfunction() + set(Z_VCPKG_EXECUTE_PROCESS_NAME "_execute_process") + else() + set(Z_VCPKG_EXECUTE_PROCESS_NAME "execute_process") endif() endif() -- cgit v1.2.3