aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2020-11-06 04:44:30 +0800
committerGitHub <noreply@github.com>2020-11-05 12:44:30 -0800
commit9032255d4146e3b00903233f8233727ad4067a0e (patch)
tree6b720f64db61fbf3d6d14c174a66589ddf014fcb
parent34283f5d8a78a814e668c44e10f02bef1c7ab674 (diff)
downloadvcpkg-9032255d4146e3b00903233f8233727ad4067a0e.tar.gz
vcpkg-9032255d4146e3b00903233f8233727ad4067a0e.zip
[magnum] Removing quotes around tools list where vcpkg_copy_tools is involked (#14383)
-rw-r--r--ports/magnum/CONTROL1
-rw-r--r--ports/magnum/portfile.cmake13
2 files changed, 3 insertions, 11 deletions
diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
index 8bea92fbf..0a0809505 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 cbdb34cd5..cb8b2473c 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)