diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake
index 2a853259e90493..a18449c690ae6b 100644
--- a/scripts/cmake/vcpkg_configure_make.cmake
+++ b/scripts/cmake/vcpkg_configure_make.cmake
@@ -116,10 +116,6 @@ macro(z_vcpkg_append_to_configure_environment inoutstring var defaultval)
     endif()
 endmacro()
 
-macro(z_convert_to_list input output)
-    string(REGEX MATCHALL "(( +|^ *)[^ ]+)" ${output} "${${input}}")
-endmacro()
-
 function(vcpkg_configure_make)
     # parse parameters such that semicolons in options arguments to COMMAND don't get erased
     cmake_parse_arguments(PARSE_ARGV 0 arg
@@ -573,11 +569,10 @@ function(vcpkg_configure_make)
         endif()
     endif()
 
-    z_convert_to_list(VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES c_libs_list)
-    z_convert_to_list(VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES cxx_libs_list)
-    set(all_libs_list ${c_libs_list} ${cxx_libs_list})
-    list(REMOVE_DUPLICATES all_libs_list)
-    list(TRANSFORM all_libs_list STRIP)
+    separate_arguments(c_libs_list NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}")
+    separate_arguments(cxx_libs_list NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}")
+    list(REMOVE_ITEM cxx_libs_list ${c_libs_list})
+    set(all_libs_list ${cxx_libs_list} ${c_libs_list})
     #Do lib list transformation from name.lib to -lname if necessary
     set(x_vcpkg_transform_libs ON)
     if(VCPKG_TARGET_IS_UWP)
@@ -587,24 +582,20 @@ function(vcpkg_configure_make)
         # Note: Env LIBPATH;LIB are on the search path for libtool by default on windows. 
         # It even does unix/dos-short/unix transformation with the path to get rid of spaces. 
     endif()
-    set(l_prefix)
     if(x_vcpkg_transform_libs)
-        set(l_prefix "-l")
-        list(TRANSFORM all_libs_list REPLACE "(.dll.lib|.lib|.a|.so)$" "")
+        list(TRANSFORM all_libs_list REPLACE "[.](dll[.]lib|lib|a|so)$" "")
         if(VCPKG_TARGET_IS_WINDOWS)
             list(REMOVE_ITEM all_libs_list "uuid")
         endif()
-        list(TRANSFORM all_libs_list REPLACE "^(${l_prefix})" "")
-    endif()
-    list(JOIN all_libs_list " ${l_prefix}" all_libs_string)
-    if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-        # libtool must be told explicitly that there is no dynamic linkage for uuid.
-        # The "-Wl,..." syntax is understood by libtool and gcc, but no by ld.
-        string(REPLACE " -luuid" " -Wl,-Bstatic,-luuid,-Bdynamic" all_libs_string "${all_libs_string}")
+        list(TRANSFORM all_libs_list REPLACE "^([^-].*)" "-l\\1")
+        if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+            # libtool must be told explicitly that there is no dynamic linkage for uuid.
+            # The "-Wl,..." syntax is understood by libtool and gcc, but no by ld.
+            list(TRANSFORM all_libs_list REPLACE "^-luuid\$" "-Wl,-Bstatic,-luuid,-Bdynamic")
+        endif()
     endif()
-
-    if(all_libs_string)
-        set(all_libs_string "${l_prefix}${all_libs_string}")
+    if(all_libs_list)
+        list(JOIN all_libs_list " " all_libs_string)
         if(DEFINED ENV{LIBS})
             set(ENV{LIBS} "$ENV{LIBS} ${all_libs_string}")
         else()