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-cmake-config] Fix parsing of NO_PREFIX_CORRECTION #21062

Merged
merged 1 commit into from Nov 9, 2021

Conversation

Osyotr
Copy link
Contributor

@Osyotr Osyotr commented Oct 29, 2021

Currently passing NO_PREFIX_CORRECTION into vcpkg_cmake_config_fixup does nothing, except when additional argument is passed (i.e. NO_PREFIX_CORRECTION dummy). This PR changes that so no additional argument is needed.

My usage:

# use "cmake/Qt5WebKit" to match other Qt ports
vcpkg_cmake_config_fixup(PACKAGE_NAME "cmake/Qt5WebKit" CONFIG_PATH "lib/cmake/Qt5WebKit" DO_NOT_DELETE_PARENT_CONFIG_PATH NO_PREFIX_CORRECTION)
vcpkg_cmake_config_fixup(PACKAGE_NAME "cmake/Qt5WebKitWidgets" CONFIG_PATH "lib/cmake/Qt5WebKitWidgets" DO_NOT_DELETE_PARENT_CONFIG_PATH NO_PREFIX_CORRECTION)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")

@JackBoosY JackBoosY added category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly requires:author-response labels Nov 1, 2021
ports/vcpkg-cmake-config/vcpkg.json Outdated Show resolved Hide resolved
@Osyotr Osyotr force-pushed the vcpkg_cmake_config_fixup_fixup branch from 066d2fe to 1b37eb5 Compare November 1, 2021 09:00
@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Nov 1, 2021
@dan-shaw dan-shaw merged commit 52fd7e4 into microsoft:master Nov 9, 2021
@Osyotr Osyotr deleted the vcpkg_cmake_config_fixup_fixup branch November 9, 2021 06:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

None yet

3 participants