From ff3103f5eb06f72abfa4178bc3634b6cdd2ac15e Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Tue, 3 Nov 2020 23:04:17 -0800
Subject: [PATCH 1/4] [vcpkg_copy_tools] Remove backslash in args

---
 scripts/cmake/vcpkg_copy_tools.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/cmake/vcpkg_copy_tools.cmake b/scripts/cmake/vcpkg_copy_tools.cmake
index 147a426960b6cb..3aa69f66a18803 100644
--- a/scripts/cmake/vcpkg_copy_tools.cmake
+++ b/scripts/cmake/vcpkg_copy_tools.cmake
@@ -33,6 +33,8 @@ function(vcpkg_copy_tools)
         message(FATAL_ERROR "TOOL_NAMES must be specified.")
     endif()
 
+    string(REPLACE "\\" "" _vct_TOOL_NAMES ${_vct_TOOL_NAMES})
+
     if(NOT DEFINED _vct_SEARCH_DIR)
         set(_vct_SEARCH_DIR ${CURRENT_PACKAGES_DIR}/bin)
     elseif(NOT IS_DIRECTORY ${_vct_SEARCH_DIR})

From 062ac7e7ed1f7287bf68c17f6158972be4c87852 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Wed, 4 Nov 2020 00:28:04 -0800
Subject: [PATCH 2/4] Update the fix

---
 scripts/cmake/vcpkg_copy_tools.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/cmake/vcpkg_copy_tools.cmake b/scripts/cmake/vcpkg_copy_tools.cmake
index 3aa69f66a18803..4df3dbd40b6990 100644
--- a/scripts/cmake/vcpkg_copy_tools.cmake
+++ b/scripts/cmake/vcpkg_copy_tools.cmake
@@ -33,7 +33,7 @@ function(vcpkg_copy_tools)
         message(FATAL_ERROR "TOOL_NAMES must be specified.")
     endif()
 
-    string(REPLACE "\\" "" _vct_TOOL_NAMES ${_vct_TOOL_NAMES})
+    string(REPLACE "\\" "" _vct_TOOL_NAMES "${_vct_TOOL_NAMES}")
 
     if(NOT DEFINED _vct_SEARCH_DIR)
         set(_vct_SEARCH_DIR ${CURRENT_PACKAGES_DIR}/bin)

From 7657b9380a49e269978b19e6a3f4f211d2689c08 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Wed, 4 Nov 2020 18:20:06 -0800
Subject: [PATCH 3/4] [magnum] Removing quotes around tools lost where
 vcpkg_copy_tools is involked

---
 ports/magnum/CONTROL                 |  1 +
 ports/magnum/portfile.cmake          | 13 ++-----------
 scripts/cmake/vcpkg_copy_tools.cmake |  2 --
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
index 8bea92fbf2a09c..0a08095051aa19 100644
--- a/ports/magnum/CONTROL
+++ b/ports/magnum/CONTROL
@@ -1,5 +1,6 @@
 Source: magnum
 Version: 2020.06
+Port-Version: 1
 Build-Depends: corrade[utility]
 Description: C++11/C++14 graphics middleware for games and data visualization
 Homepage: https://magnum.graphics/
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
index cbdb34cd57cf90..cb8b2473c3dc44 100644
--- a/ports/magnum/portfile.cmake
+++ b/ports/magnum/portfile.cmake
@@ -79,13 +79,6 @@ vcpkg_install_cmake()
 
 vcpkg_copy_pdbs()
 
-# Drop a copy of tools
-if(NOT VCPKG_CMAKE_SYSTEM_NAME)
-    set(EXE_SUFFIX .exe)
-else()
-    set(EXE_SUFFIX)
-endif()
-
 # Copy tools into vcpkg's tools directory
 set(_TOOL_EXEC_NAMES "")
 set(_TOOLS
@@ -102,7 +95,7 @@ foreach(_tool IN LISTS _TOOLS)
 endforeach()
 message(STATUS ${_TOOL_EXEC_NAMES})
 if(_TOOL_EXEC_NAMES)
-    vcpkg_copy_tools(TOOL_NAMES "${_TOOL_EXEC_NAMES}" AUTO_CLEAN)
+    vcpkg_copy_tools(TOOL_NAMES ${_TOOL_EXEC_NAMES} AUTO_CLEAN)
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
@@ -123,6 +116,4 @@ else()
    file(COPY ${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/magnum-d)
 endif()
 
-file(INSTALL ${SOURCE_PATH}/COPYING
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
-    RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/scripts/cmake/vcpkg_copy_tools.cmake b/scripts/cmake/vcpkg_copy_tools.cmake
index 4df3dbd40b6990..147a426960b6cb 100644
--- a/scripts/cmake/vcpkg_copy_tools.cmake
+++ b/scripts/cmake/vcpkg_copy_tools.cmake
@@ -33,8 +33,6 @@ function(vcpkg_copy_tools)
         message(FATAL_ERROR "TOOL_NAMES must be specified.")
     endif()
 
-    string(REPLACE "\\" "" _vct_TOOL_NAMES "${_vct_TOOL_NAMES}")
-
     if(NOT DEFINED _vct_SEARCH_DIR)
         set(_vct_SEARCH_DIR ${CURRENT_PACKAGES_DIR}/bin)
     elseif(NOT IS_DIRECTORY ${_vct_SEARCH_DIR})

From b6196e23258baa333bddd816829c6717e4d8804b Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Wed, 4 Nov 2020 18:20:06 -0800
Subject: [PATCH 4/4] [magnum] Removing quotes around tools list where
 vcpkg_copy_tools is involked

---
 ports/magnum/CONTROL                 |  1 +
 ports/magnum/portfile.cmake          | 13 ++-----------
 scripts/cmake/vcpkg_copy_tools.cmake |  2 --
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
index 8bea92fbf2a09c..0a08095051aa19 100644
--- a/ports/magnum/CONTROL
+++ b/ports/magnum/CONTROL
@@ -1,5 +1,6 @@
 Source: magnum
 Version: 2020.06
+Port-Version: 1
 Build-Depends: corrade[utility]
 Description: C++11/C++14 graphics middleware for games and data visualization
 Homepage: https://magnum.graphics/
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
index cbdb34cd57cf90..cb8b2473c3dc44 100644
--- a/ports/magnum/portfile.cmake
+++ b/ports/magnum/portfile.cmake
@@ -79,13 +79,6 @@ vcpkg_install_cmake()
 
 vcpkg_copy_pdbs()
 
-# Drop a copy of tools
-if(NOT VCPKG_CMAKE_SYSTEM_NAME)
-    set(EXE_SUFFIX .exe)
-else()
-    set(EXE_SUFFIX)
-endif()
-
 # Copy tools into vcpkg's tools directory
 set(_TOOL_EXEC_NAMES "")
 set(_TOOLS
@@ -102,7 +95,7 @@ foreach(_tool IN LISTS _TOOLS)
 endforeach()
 message(STATUS ${_TOOL_EXEC_NAMES})
 if(_TOOL_EXEC_NAMES)
-    vcpkg_copy_tools(TOOL_NAMES "${_TOOL_EXEC_NAMES}" AUTO_CLEAN)
+    vcpkg_copy_tools(TOOL_NAMES ${_TOOL_EXEC_NAMES} AUTO_CLEAN)
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
@@ -123,6 +116,4 @@ else()
    file(COPY ${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/magnum-d)
 endif()
 
-file(INSTALL ${SOURCE_PATH}/COPYING
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
-    RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/scripts/cmake/vcpkg_copy_tools.cmake b/scripts/cmake/vcpkg_copy_tools.cmake
index 4df3dbd40b6990..147a426960b6cb 100644
--- a/scripts/cmake/vcpkg_copy_tools.cmake
+++ b/scripts/cmake/vcpkg_copy_tools.cmake
@@ -33,8 +33,6 @@ function(vcpkg_copy_tools)
         message(FATAL_ERROR "TOOL_NAMES must be specified.")
     endif()
 
-    string(REPLACE "\\" "" _vct_TOOL_NAMES "${_vct_TOOL_NAMES}")
-
     if(NOT DEFINED _vct_SEARCH_DIR)
         set(_vct_SEARCH_DIR ${CURRENT_PACKAGES_DIR}/bin)
     elseif(NOT IS_DIRECTORY ${_vct_SEARCH_DIR})