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.

Sign up for GitHub

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

[Pcre2] Check if files exists before call vcpkg_replace_string. #22003

Merged
merged 5 commits into from
Dec 14, 2021
Merged

[Pcre2] Check if files exists before call vcpkg_replace_string. #22003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
545f1fa
Check if files exists before call vcpkg_replace_string.
Dec 13, 2021
4a2d74d
Update per comments.
Dec 13, 2021
3b4e6b9
Update ports/pcre2/portfile.cmake
larshg Dec 13, 2021
c4b8144
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 14, 2021
6b86e07
Bump port-version.
BillyONeal Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ports/pcre2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ if(BUILD_STATIC)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
elseif(VCPKG_TARGET_IS_WINDOWS)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
endif()
endif()

file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
2 changes: 1 addition & 1 deletion ports/pcre2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pcre2",
"version": "10.39",
"port-version": 1,
"port-version": 2,
"description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.",
"homepage": "https://github.com/PhilipHazel/pcre2",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5190,7 +5190,7 @@
},
"pcre2": {
"baseline": "10.39",
"port-version": 1
"port-version": 2
},
"pdal": {
"baseline": "1.7.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/pcre2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9a15903858198c8a3b890972b5e8c0d2aa3f89f8",
"version": "10.39",
"port-version": 2
},
{
"git-tree": "b25437749e0bcdd96807c66a8fc8764382c55203",
"version": "10.39",
Expand Down