diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-02-05 08:59:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-05 08:59:05 +0100 |
| commit | 877ebc43249461196670dbecd3c1cfd5a6265d2a (patch) | |
| tree | a0b872942c7c20460c40d33f353767c61ed205ed /toolsrc/src | |
| parent | 9298dec358d145b0feb0d7336f755c639fbacde8 (diff) | |
| download | vcpkg-877ebc43249461196670dbecd3c1cfd5a6265d2a.tar.gz vcpkg-877ebc43249461196670dbecd3c1cfd5a6265d2a.zip | |
Move " to correct position
and change copyright copy to use configure_file
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/postbuildlint.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/toolsrc/src/vcpkg/postbuildlint.cpp b/toolsrc/src/vcpkg/postbuildlint.cpp index 64018f9d1..663d2e3c9 100644 --- a/toolsrc/src/vcpkg/postbuildlint.cpp +++ b/toolsrc/src/vcpkg/postbuildlint.cpp @@ -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()); } |