Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg] Small fixes to vcpkg_build_make #21296

Merged
merged 2 commits into from
Nov 26, 2021
Merged

Conversation

plq
Copy link
Contributor

@plq plq commented Nov 10, 2021

Describe the pull request

  • What does your PR fix?

    • vcpkg_build_make docs
    • a small typo in the handling of the subpath parameter
  • Which triplets are supported?

    all

  • Have you updated the CI baseline?

    no

  • Does your PR follow the maintainer guide?

    seems so

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    no port additions

@plq plq changed the title Fix vcpkg Small fixes to vcpkg_build_make Nov 10, 2021
@NancyLi1013 NancyLi1013 added the category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) label Nov 10, 2021
@PhoebeHui PhoebeHui assigned PhoebeHui and unassigned NancyLi1013 Nov 22, 2021
@PhoebeHui PhoebeHui requested a review from JackBoosY November 23, 2021 09:57
@PhoebeHui
Copy link
Contributor

@plq, thanks for the PR! could apply the following patch and submit the changes again?
format.diff (1).zip

@PhoebeHui PhoebeHui changed the title Small fixes to vcpkg_build_make [vcpkg] Small fixes to vcpkg_build_make Nov 23, 2021
plq added 2 commits November 23, 2021 15:18
Change-Id: I44c39663c397cbdeadf1b875ee7e6e1c781add05
Change-Id: I1f401256b2f4e600a1216de499f044ea3c5a2130
@JackBoosY
Copy link
Contributor

cc @Neumann-A for review this PR togather.

@@ -132,7 +136,7 @@ function(vcpkg_build_make)
set(path_suffix "")
endif()

set(working_directory "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}${arg_SUBPATH}")
set(working_directory "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}/${arg_SUBPATH}")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's correct, since no port use this options, this issue is hidden under the sea.

Copy link
Contributor

@JackBoosY JackBoosY left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is more like a modification of the document.

@JackBoosY JackBoosY added category:documentation To resolve the issue, documentation will need to be updated category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:reviewed Pull Request changes follow basic guidelines and removed category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) requires:author-response labels Nov 24, 2021
@BillyONeal BillyONeal merged commit e020134 into microsoft:master Nov 26, 2021
@BillyONeal
Copy link
Member

Thanks for the typo fix!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:documentation To resolve the issue, documentation will need to be updated category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants