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

[python3] Install pkg-config files on Windows platforms #22198

Merged
merged 1 commit into from
Jan 3, 2022
Merged

[python3] Install pkg-config files on Windows platforms #22198

merged 1 commit into from
Jan 3, 2022

Conversation

mkhon
Copy link
Contributor

@mkhon mkhon commented Dec 25, 2021

Install pkg-config configuration files on Windows platforms (msbuild builds)

  • What does your PR fix?

  • Which triplets are supported/not supported? Have you updated the CI baseline?

all

Yes

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

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

@ghost
Copy link

ghost commented Dec 25, 2021

CLA assistant check
All CLA requirements met.

@JackBoosY JackBoosY added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Dec 25, 2021
Copy link
Contributor

@Hoikas Hoikas left a comment

Choose a reason for hiding this comment

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

These changes assume that both release and debug builds are being built. It needs to be made safe for release only and debug only triplets.

ports/python3/portfile.cmake Outdated Show resolved Hide resolved
ports/python3/portfile.cmake Outdated Show resolved Hide resolved
ports/python3/portfile.cmake Show resolved Hide resolved
@LilyWangLL
Copy link
Contributor

Thanks for your PR. Please run command vcpkg x-add-version --all then commit the changes.

@mkhon
Copy link
Contributor Author

mkhon commented Dec 28, 2021

These changes assume that both release and debug builds are being built. It needs to be made safe for release only and debug only triplets.

Fixed now

@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Dec 29, 2021
@mkhon mkhon changed the title [python3] Install pkg-config files [python3] Install pkg-config files on Windows platforms Dec 29, 2021
@@ -158,6 +159,30 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
)
endif()

vcpkg_backup_env_variables(VARS prefix exec_prefix libdir includedir VERSION)
Copy link
Member

Choose a reason for hiding this comment

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

Maybe I'm confused by my understanding is that configure_file only looks at CMake variables, not environment variables, so this call to vcpkg_backup_env_variables and vcpkg_restore_env_variables doesn't seem to have an effect?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ping @mkhon for response.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, @BillyONeal is right - I updated the PR

@BillyONeal BillyONeal added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Dec 29, 2021
@BillyONeal BillyONeal merged commit c662463 into microsoft:master Jan 3, 2022
@BillyONeal
Copy link
Member

Thanks!

@mkhon mkhon deleted the fix/python3-pkgconfig branch January 4, 2022 02:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants