diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-08-10 15:40:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 15:40:21 -0700 |
| commit | 634c1043b01dff682dc9834f4987037683764034 (patch) | |
| tree | 659c672a21ab7e9142b6e0a66f07956fe8e53db0 /ports | |
| parent | 92f6eb402afbf32dcc8d4083ccb5ae01dcf10881 (diff) | |
| download | vcpkg-634c1043b01dff682dc9834f4987037683764034.tar.gz vcpkg-634c1043b01dff682dc9834f4987037683764034.zip | |
[vcpkg_copy_tool_dependencies] Use vcpkg internal powershell (#12776)
* Use vcpkg internal powershell
* [protobuf] change vcpkg_copy_tool_dependencies to vcpkg_copy_tools
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/protobuf/CONTROL | 2 | ||||
| -rw-r--r-- | ports/protobuf/portfile.cmake | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index f444ab67a..3b2a541bc 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,6 +1,6 @@ Source: protobuf Version: 3.12.3 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/google/protobuf Description: Protocol Buffers - Google's data interchange format diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 4bfc11644..3b8f806cf 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -90,8 +90,7 @@ protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/share) if(CMAKE_HOST_WIN32) if(protobuf_BUILD_PROTOC_BINARIES) - file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/protoc.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tools(TOOL_NAMES protoc) else() file(COPY ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) endif() |