aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/PostBuildLint.cpp
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-03-15 16:14:02 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-03-15 16:14:02 -0700
commit3e015053991b84f6e32f8fe9dd49ee2ba0e63f12 (patch)
treed2b8fa7088fac635409adb87d623cd561f9f1af3 /toolsrc/src/PostBuildLint.cpp
parent9027a64371736d21c4527ac69d81519c69d241a3 (diff)
downloadvcpkg-3e015053991b84f6e32f8fe9dd49ee2ba0e63f12.tar.gz
vcpkg-3e015053991b84f6e32f8fe9dd49ee2ba0e63f12.zip
[vcpkg-lint] Fix post-build checks to avoid a goose chase around /lib/cmake.
Diffstat (limited to 'toolsrc/src/PostBuildLint.cpp')
-rw-r--r--toolsrc/src/PostBuildLint.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp
index 468236b54..00a6eabe6 100644
--- a/toolsrc/src/PostBuildLint.cpp
+++ b/toolsrc/src/PostBuildLint.cpp
@@ -98,12 +98,12 @@ namespace vcpkg::PostBuildLint
return lint_status::SUCCESS;
}
- static lint_status check_folder_lib_cmake(const fs::path& package_dir)
+ static lint_status check_folder_lib_cmake(const fs::path& package_dir, const package_spec& spec)
{
const fs::path lib_cmake = package_dir / "lib" / "cmake";
if (fs::exists(lib_cmake))
{
- System::println(System::color::warning, "The /lib/cmake folder should be moved to just /cmake");
+ System::println(System::color::warning, "The /lib/cmake folder should be moved to /share/%s/cmake.", spec.name());
return lint_status::ERROR_DETECTED;
}
@@ -630,7 +630,7 @@ namespace vcpkg::PostBuildLint
error_count += check_for_files_in_include_directory(package_dir);
error_count += check_for_files_in_debug_include_directory(package_dir);
error_count += check_for_files_in_debug_share_directory(package_dir);
- error_count += check_folder_lib_cmake(package_dir);
+ error_count += check_folder_lib_cmake(package_dir, spec);
error_count += check_for_misplaced_cmake_files(package_dir, spec);
error_count += check_folder_debug_lib_cmake(package_dir);
error_count += check_for_dlls_in_lib_dirs(package_dir);