Fix escaping of list items from triplets

ports/aws-sdk-cpp/portfile.cmake

@@ -14,8 +14,6 @@ set(BUILD_ONLY core)
 
 include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
 
-string(REPLACE ";" "\\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     DISABLE_PARALLEL_CONFIGURE

ports/gdal/portfile.cmake

@@ -264,7 +264,7 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor
     message(STATUS "Building ${TARGET_TRIPLET}-rel")
     vcpkg_execute_required_process(
       COMMAND ${NMAKE} -f makefile.vc
-      "${NMAKE_OPTIONS_REL}"
+      ${NMAKE_OPTIONS_REL}
       WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
       LOGNAME nmake-build-${TARGET_TRIPLET}-release
     )
@@ -279,7 +279,7 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor
     message(STATUS "Building ${TARGET_TRIPLET}-dbg")
     vcpkg_execute_required_process(
       COMMAND ${NMAKE} /G -f makefile.vc
-      "${NMAKE_OPTIONS_DBG}"
+      ${NMAKE_OPTIONS_DBG}
       WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
       LOGNAME nmake-build-${TARGET_TRIPLET}-debug
     )
@@ -294,7 +294,7 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor
 
   vcpkg_execute_required_process(
     COMMAND ${NMAKE} -f makefile.vc
-    "${NMAKE_OPTIONS_REL}"
+    ${NMAKE_OPTIONS_REL}
     "install"
     "devinstall"
     WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}

ports/soil/portfile.cmake

@@ -1,14 +1,12 @@
 include(vcpkg_common_functions)
 
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://www.lonesock.net/files/soil.zip"
-    FILENAME "soil-2008.07.07.zip"
-    SHA512 a575a84aa65b7556320779d635561341f5cf156418d0462473e5d1eb082829be3bcb30600b4887af75aeddd3715de16bdb3ca1668ebaa93eea62bacf22b79548
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    REPO biotrump/SOIL
+     # repo from 2016; matches http://web.archive.org/web/20200104042737/http://www.lonesock.net/files/soil.zip (which is now down) via git diff -w
+    REF d8c9aa735c80f0de9f732235a910990b1838d010
+    SHA512 7c655195235e2a44a897e944dbc923411f117013623de6af8f4df6a189c3666cc0472dfc1d467af060fddb140b1ea0b68970f8cbec9a3d955df3a5b404795be6
+    HEAD_REF master
 )
 
 file(COPY

scripts/cmake/vcpkg_build_nmake.cmake

@@ -188,7 +188,7 @@ function(vcpkg_build_nmake)
             if (BUILDTYPE STREQUAL "debug" AND _bn_PRERUN_SHELL_DEBUG)
                 message(STATUS "Prerunning ${CURRENT_TRIPLET_NAME}")
                 vcpkg_execute_required_process(
-                    COMMAND "${_bn_PRERUN_SHELL_DEBUG}"
+                    COMMAND ${_bn_PRERUN_SHELL_DEBUG}
                     WORKING_DIRECTORY ${OBJ_DIR}${_bn_PROJECT_SUBPATH}
                     LOGNAME "prerun-${CURRENT_TRIPLET_NAME}-dbg"
                 )

scripts/cmake/vcpkg_configure_cmake.cmake

@@ -59,11 +59,10 @@
 ## * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake)
 ## * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake)
 function(vcpkg_configure_cmake)
-    cmake_parse_arguments(_csc
+    cmake_parse_arguments(PARSE_ARGV 0 _csc
         "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG"
         "SOURCE_PATH;GENERATOR"
         "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE"
-        ${ARGN}
     )
 
     if(NOT VCPKG_PLATFORM_TOOLSET)
@@ -211,7 +210,6 @@ function(vcpkg_configure_cmake)
         endif()
     endif()
 
-
     list(APPEND _csc_OPTIONS
         "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}"
         "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}"
@@ -250,7 +248,8 @@ function(vcpkg_configure_cmake)
     # Sets configuration variables for macOS builds
     foreach(config_var  INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES)
         if(DEFINED VCPKG_${config_var})
-            list(APPEND _csc_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}")
+            string(REPLACE ";" "\\;" _csc_VCPKG_CONFIG_VAR "${VCPKG_${config_var}}")
+            list(APPEND _csc_OPTIONS "-DCMAKE_${config_var}=${_csc_VCPKG_CONFIG_VAR}")
         endif()
     endforeach()
 

scripts/cmake/vcpkg_execute_required_process.cmake

@@ -34,7 +34,7 @@
 ## * [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake)
 include(vcpkg_prettify_command)
 function(vcpkg_execute_required_process)
-    cmake_parse_arguments(vcpkg_execute_required_process "ALLOW_IN_DOWNLOAD_MODE" "WORKING_DIRECTORY;LOGNAME" "COMMAND" ${ARGN})
+    cmake_parse_arguments(PARSE_ARGV 0 vcpkg_execute_required_process "ALLOW_IN_DOWNLOAD_MODE" "WORKING_DIRECTORY;LOGNAME" "COMMAND")
     set(LOG_OUT "${CURRENT_BUILDTREES_DIR}/${vcpkg_execute_required_process_LOGNAME}-out.log")
     set(LOG_ERR "${CURRENT_BUILDTREES_DIR}/${vcpkg_execute_required_process_LOGNAME}-err.log")