aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2017-01-16 18:38:31 -0800
committerGitHub <noreply@github.com>2017-01-16 18:38:31 -0800
commit08f5e2f04fa98b657bc92d4fc692f13f36b10f65 (patch)
treec92ce94ceb9c49752cb3cabda28b778e518238ed
parent4ace533ad7fd7fe81e72bcb6926f2f6136137b11 (diff)
parent74784355e56df89b5deaf886a546289fcd5eabf9 (diff)
downloadvcpkg-08f5e2f04fa98b657bc92d4fc692f13f36b10f65.tar.gz
vcpkg-08f5e2f04fa98b657bc92d4fc692f13f36b10f65.zip
Merge pull request #539 from codicodi/fix-grpc
[grpc] build statically
-rw-r--r--ports/grpc/CONTROL2
-rw-r--r--ports/grpc/portfile.cmake10
2 files changed, 7 insertions, 5 deletions
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL
index ece5b96ce..b9d19da4c 100644
--- a/ports/grpc/CONTROL
+++ b/ports/grpc/CONTROL
@@ -1,4 +1,4 @@
Source: grpc
-Version: 1.1.0-dev-1674f65
+Version: 1.1.0-dev-1674f65-1
Build-Depends: zlib, openssl, protobuf
Description: An RPC library and framework \ No newline at end of file
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index a54af6e55..ffd71d137 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -1,6 +1,6 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
- message(STATUS "Warning: Static building not supported yet. Building dynamic.")
- set(VCPKG_LIBRARY_LINKAGE dynamic)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+ message(STATUS "Warning: Dynamic building not supported yet. Building static.")
+ set(VCPKG_LIBRARY_LINKAGE static)
endif()
include(vcpkg_common_functions)
find_program(GIT git)
@@ -55,7 +55,9 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/gRPC/gRPCTargets-debug.cmake
file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/grpc RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
vcpkg_copy_pdbs()