From 5b4707497351f62e5e8f8510404fe7c3ddca6bdb Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Tue, 27 Jun 2023 22:57:04 -0700 Subject: [PATCH 1/2] Update license install hint --- src/vcpkg/postbuildlint.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/vcpkg/postbuildlint.cpp b/src/vcpkg/postbuildlint.cpp index b4d90d16b0..dc08904432 100644 --- a/src/vcpkg/postbuildlint.cpp +++ b/src/vcpkg/postbuildlint.cpp @@ -394,11 +394,8 @@ namespace vcpkg 1); // The +1 is needed to remove the "/" const Path relative_path = found_relative_native; msg_sink.print(Color::none, - fmt::format("\n configure_file(\"${{CURRENT_BUILDTREES_DIR}}/{}/{}\" " - "\"${{CURRENT_PACKAGES_DIR}}/share/{}/copyright\" COPYONLY)\n", - relative_path.generic_u8string(), - found_file.filename(), - spec.name())); + fmt::format("\n vcpkg_install_copyright(FILE_LIST \"${{SOURCE_PATH}}/{}\")\n", + found_file.filename())); } else if (potential_copyright_files.size() > 1) { From 4cc38b4ddb3d876f5c9e841db8d7d257a66b6824 Mon Sep 17 00:00:00 2001 From: Lily Wang <494550702@qq.com> Date: Thu, 29 Jun 2023 00:22:02 -0700 Subject: [PATCH 2/2] add relative path --- src/vcpkg/postbuildlint.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vcpkg/postbuildlint.cpp b/src/vcpkg/postbuildlint.cpp index dc08904432..52d0d0478e 100644 --- a/src/vcpkg/postbuildlint.cpp +++ b/src/vcpkg/postbuildlint.cpp @@ -394,7 +394,8 @@ namespace vcpkg 1); // The +1 is needed to remove the "/" const Path relative_path = found_relative_native; msg_sink.print(Color::none, - fmt::format("\n vcpkg_install_copyright(FILE_LIST \"${{SOURCE_PATH}}/{}\")\n", + fmt::format("\n vcpkg_install_copyright(FILE_LIST \"${{SOURCE_PATH}}/{}/{}\")\n", + relative_path.generic_u8string(), found_file.filename())); } else if (potential_copyright_files.size() > 1)