cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2024-11-28 05:30:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[grpc] Use vcpkg_copy_tool_dependencies

Browse Source
This commit is contained in:
Robert Schumacher 2017-07-07 17:19:19 -07:00
parent c0890d7276
commit 4267c86b1f
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/grpc/CONTROL
View File

@ -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

6
ports/grpc/portfile.cmake
View File

@ -60,11 +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)
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
file(COPY ${CURRENT_INSTALLED_DIR}/bin/libprotobuf.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/grpc)
file(COPY ${CURRENT_INSTALLED_DIR}/bin/libprotoc.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/grpc)
file(COPY ${CURRENT_INSTALLED_DIR}/bin/zlib1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/grpc)
endif()
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/grpc)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)

14
toolsrc/src/PostBuildLint.cpp
View File

@ -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);