aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/PostBuildLint.cpp
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-07-07 17:19:19 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-07-07 17:19:29 -0700
commit4267c86b1f7cfe20e88fe7a1eaaa4caaca8c5d77 (patch)
treedfe48fd0256c086c1f87f4d8f0984f08b40fdbe3 /toolsrc/src/PostBuildLint.cpp
parentc0890d7276f8a999e2e0914de617755ecb302cb0 (diff)
downloadvcpkg-4267c86b1f7cfe20e88fe7a1eaaa4caaca8c5d77.tar.gz
vcpkg-4267c86b1f7cfe20e88fe7a1eaaa4caaca8c5d77.zip
[grpc] Use vcpkg_copy_tool_dependencies
Diffstat (limited to 'toolsrc/src/PostBuildLint.cpp')
-rw-r--r--toolsrc/src/PostBuildLint.cpp14
1 files changed, 7 insertions, 7 deletions
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);