aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-12-18 17:31:37 -0800
committerRobert Schumacher <roschuma@microsoft.com>2019-01-09 12:27:19 -0800
commitbdc430c8ec3925ee3de10be152a192459ef84ce1 (patch)
tree4e77c27c93aec81bf4eb6bcb1f35508281640945
parentbb1bb1c94a72b891883efa6522791620ef3bbc0f (diff)
downloadvcpkg-bdc430c8ec3925ee3de10be152a192459ef84ce1.tar.gz
vcpkg-bdc430c8ec3925ee3de10be152a192459ef84ce1.zip
[protobuf] Fix protoc.exe on non-windows
-rw-r--r--ports/protobuf/CONTROL2
-rw-r--r--ports/protobuf/portfile.cmake7
2 files changed, 6 insertions, 3 deletions
diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL
index 89719093c..88bc7d3ee 100644
--- a/ports/protobuf/CONTROL
+++ b/ports/protobuf/CONTROL
@@ -1,5 +1,5 @@
Source: protobuf
-Version: 3.6.1.3
+Version: 3.6.1.3-1
Description: Protocol Buffers - Google's data interchange format
Feature: zlib
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index 31f1b3819..32e8ccd91 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -106,9 +106,12 @@ if(CMAKE_HOST_WIN32)
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin/protoc.exe)
endif()
else()
+ file(GLOB EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/protoc*)
+ foreach(E IN LISTS EXECUTABLES)
+ file(INSTALL ${E} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/protobuf
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ)
+ endforeach()
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin)
- file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/protoc DESTINATION ${CURRENT_PACKAGES_DIR}/tools/protobuf
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ)
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin)
endif()