From 02bfa2961ad0bc06efd2540b14f14659ad158177 Mon Sep 17 00:00:00 2001
From: jgehw <44170764+jgehw@users.noreply.github.com>
Date: Mon, 24 Aug 2020 21:32:34 +0200
Subject: fix vcpkg_configure_cmake for case when having semicolons in OPTIONS
 (#12977)

---
 ports/lapack-reference/portfile.cmake     | 2 +-
 scripts/cmake/vcpkg_configure_cmake.cmake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake
index 1e3f8d6b6..dcdce397a 100644
--- a/ports/lapack-reference/portfile.cmake
+++ b/ports/lapack-reference/portfile.cmake
@@ -59,7 +59,7 @@ vcpkg_configure_cmake(
         OPTIONS
             "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}"
             "-DCBLAS=${CBLAS}"
-            "${FORTRAN_CMAKE}"
+            ${FORTRAN_CMAKE}
         )
 
 vcpkg_install_cmake()
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index 9f75c5e07..ce534b7aa 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -59,11 +59,11 @@
 ## * [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
+    # parse parameters such that semicolons in arguments to OPTIONS don't get erased
+    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)
-- 
cgit v1.2.3