-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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
[oniguruma] update to 6.9.10 #43651
[oniguruma] update to 6.9.10 #43651
Conversation
|
||
vcpkg_fixup_pkgconfig() | ||
|
||
# Note that onig-config is a shell script, not CMake configs, so | ||
# vcpkg_cmake_config_fixup would be inappropriate | ||
file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/onig-config") | ||
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/onig-config") | ||
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/onig-config") | ||
endif() | ||
vcpkg_fixup_pkgconfig() | ||
# Note that onig-config is a shell script, not CMake configs, so | ||
# vcpkg_cmake_config_fixup would be inappropriate | ||
file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/onig-config") | ||
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/onig-config") | ||
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/onig-config") | ||
endif() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The content here has not been modified. Please restore the changes regarding the end of the line.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@LilyWangLL
Thank you for review.
I will fix these lines.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@LilyWangLL
Sorry, I can't find a way to revert these lines.
Only these lines has been detected modified while I reverted crlf.
I will create another PR.
|
||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") | ||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include/") | ||
|
||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) | ||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") | ||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") | ||
endif() | ||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") | ||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include/") | ||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) | ||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") | ||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") | ||
endif() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The content here has not been modified. Please restore the changes regarding the end of the line.
@@ -1,10 +1,10 @@ | |||
vcpkg_from_github( | |||
OUT_SOURCE_PATH SOURCE_PATH | |||
REPO kkos/oniguruma | |||
REF "v${VERSION}" | |||
SHA512 7c89247d8504c635687dc61b39b39b5afefa4851b24409a8eab31273f1cbc88f3db89095ae4b135bd034147d2616c2e18fc74887300b89532eedeab75677f437 | |||
REF "v${VERSION}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The content here has not been modified. Please restore the changes regarding the end of the line.
./vcpkg x-add-version --all
and committing the result.