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

[icu] Fix pc files #22388

Merged
merged 3 commits into from
Jan 13, 2022
Merged

[icu] Fix pc files #22388

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2135fb9
[icu] Fix pc files
PhoebeHui Jan 6, 2022
659a313
Merge branch 'master' into dev/Phoebe/icu_pc
PhoebeHui Jan 12, 2022
72c2217
Patch the issue in configure.ac
PhoebeHui Jan 12, 2022
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
18 changes: 16 additions & 2 deletions ports/icu/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,22 @@ endif()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread m)

if(VCPKG_TARGET_IS_WINDOWS)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(GLOB DEBUG_PKGCONFIGS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
foreach(pkg_file IN LISTS DEBUG_PKGCONFIGS)
vcpkg_replace_string("${pkg_file}" " -lm" "")
endforeach()
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(GLOB RELEASE_PKGCONFIGS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc")
foreach(pkg_file IN LISTS RELEASE_PKGCONFIGS)
vcpkg_replace_string("${pkg_file}" " -lm" "")
endforeach()
endif()
endif()

vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/icu/bin/icu-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../")

# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
2 changes: 1 addition & 1 deletion ports/icu/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "icu",
"version": "69.1",
"port-version": 16,
"port-version": 17,
"description": "Mature and widely used Unicode and localization library.",
"homepage": "https://icu.unicode.org/home",
"supports": "!uwp",
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 @@ -2742,7 +2742,7 @@
},
"icu": {
"baseline": "69.1",
"port-version": 16
"port-version": 17
},
"ideviceinstaller": {
"baseline": "1.1.2.23",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/icu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "37af8cc206533b271f1f07b593c73b8ccf1cb5b4",
"version": "69.1",
"port-version": 17
},
{
"git-tree": "042eb68cba932ed45a95883c733406331cbaad6c",
"version": "69.1",
Expand Down