Move " to correct position

and change copyright copy to use configure_file
This commit is contained in:
Alexander Neumann 2020-02-05 08:59:05 +01:00 committed by GitHub
parent 9298dec358
commit 877ebc4324
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -200,7 +200,7 @@ namespace vcpkg::PostBuildLint
System::print2(System::Color::warning,
"Include files should not be duplicated into the /debug/include directory. If this cannot "
"be disabled in the project cmake, use\n"
" file(REMOVE_RECURSE \"${CURRENT_PACKAGES_DIR}/debug/include)\"\n");
" file(REMOVE_RECURSE \"${CURRENT_PACKAGES_DIR}/debug/include\")\n");
return LintStatus::ERROR_DETECTED;
}
@ -215,7 +215,7 @@ namespace vcpkg::PostBuildLint
{
System::print2(System::Color::warning,
"/debug/share should not exist. Please reorganize any important files, then use\n"
" file(REMOVE_RECURSE \"${CURRENT_PACKAGES_DIR}/debug/share)\"\n");
" file(REMOVE_RECURSE \"${CURRENT_PACKAGES_DIR}/debug/share\")\n");
return LintStatus::ERROR_DETECTED;
}
@ -349,11 +349,8 @@ namespace vcpkg::PostBuildLint
const fs::path relative_path = found_file.string().erase(
0, current_buildtrees_dir.string().size() + 1); // The +1 is needed to remove the "/"
System::printf(
"\n file(COPY \"${CURRENT_BUILDTREES_DIR}/%s\" DESTINATION \"${CURRENT_PACKAGES_DIR}/share/%s\")\n"
" file(RENAME \"${CURRENT_PACKAGES_DIR}/share/%s/%s\" \"${CURRENT_PACKAGES_DIR}/share/%s/copyright\")\n",
"\n configure_file(\"${CURRENT_BUILDTREES_DIR}/%s/%s\" \"${CURRENT_PACKAGES_DIR}/share/%s/copyright\" COPYONLY)\n",
relative_path.generic_string(),
spec.name(),
spec.name(),
found_file.filename().generic_string(),
spec.name());
}