diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-07-07 17:20:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-07 17:20:01 -0700 |
| commit | c2d1711a5fa8aaa90310ce85f396cf9888fb41bd (patch) | |
| tree | 1ea520b6e1400092b74c2b58380f7905f1c257d0 | |
| parent | 0afe1112c18b95e694706ed9d91a63cdb48174c3 (diff) | |
| parent | 4267c86b1f7cfe20e88fe7a1eaaa4caaca8c5d77 (diff) | |
| download | vcpkg-c2d1711a5fa8aaa90310ce85f396cf9888fb41bd.tar.gz vcpkg-c2d1711a5fa8aaa90310ce85f396cf9888fb41bd.zip | |
Merge pull request #1406 from KindDragon/grpc-plugin-fix
[grpc] Fix missing dll's for grpc_cpp_plugin
| -rw-r--r-- | ports/grpc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/grpc/portfile.cmake | 1 | ||||
| -rw-r--r-- | toolsrc/src/PostBuildLint.cpp | 14 |
3 files changed, 9 insertions, 8 deletions
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index 8298a047c..280342f61 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,4 +1,4 @@ Source: grpc -Version: 1.4.0 +Version: 1.4.0-1 Build-Depends: zlib, openssl, protobuf, c-ares 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 3397e86dc..1c2f4b7f2 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -60,6 +60,7 @@ file(GLOB TOOLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.exe") if(TOOLS) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/grpc) file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/grpc) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/grpc) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp index 82d50a68f..8e11ae5b1 100644 --- a/toolsrc/src/PostBuildLint.cpp +++ b/toolsrc/src/PostBuildLint.cpp @@ -775,15 +775,15 @@ namespace vcpkg::PostBuildLint error_count += check_lib_architecture(pre_build_info.target_architecture, libs); } + std::vector<fs::path> debug_dlls = fs.get_files_recursive(debug_bin_dir); + Util::unstable_keep_if(debug_dlls, has_extension_pred(fs, ".dll")); + std::vector<fs::path> release_dlls = fs.get_files_recursive(release_bin_dir); + Util::unstable_keep_if(release_dlls, has_extension_pred(fs, ".dll")); + switch (build_info.library_linkage) { case Build::LinkageType::DYNAMIC: { - std::vector<fs::path> debug_dlls = fs.get_files_recursive(debug_bin_dir); - Util::unstable_keep_if(debug_dlls, has_extension_pred(fs, ".dll")); - std::vector<fs::path> release_dlls = fs.get_files_recursive(release_bin_dir); - Util::unstable_keep_if(release_dlls, has_extension_pred(fs, ".dll")); - error_count += check_matching_debug_and_release_binaries(debug_dlls, release_dlls); error_count += check_lib_files_are_available_if_dlls_are_available( @@ -804,8 +804,8 @@ namespace vcpkg::PostBuildLint } case Build::LinkageType::STATIC: { - std::vector<fs::path> dlls = fs.get_files_recursive(package_dir); - Util::unstable_keep_if(dlls, has_extension_pred(fs, ".dll")); + auto dlls = release_dlls; + dlls.insert(dlls.end(), debug_dlls.begin(), debug_dlls.end()); error_count += check_no_dlls_present(dlls); error_count += check_bin_folders_are_not_present_in_static_build(fs, package_dir); |