Skip to content

Commit

Permalink
[Pcre2] Check if files exists before call vcpkg_replace_string. (#22003)
Browse files Browse the repository at this point in the history
* Check if files exists before call vcpkg_replace_string.

* Update per comments.

Only guard debug.

* Update ports/pcre2/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Bump port-version.

Co-authored-by: GLUD Lars <lars.glud@leica-geosystems.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
  • Loading branch information
4 people authored Dec 14, 2021
1 parent 1e1ed5d commit 404819d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
4 changes: 3 additions & 1 deletion ports/pcre2/portfile.cmake
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
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
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
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

0 comments on commit 404819d

Please sign in to comment.