Skip to content

Commit b05ee4f

Browse files
Bump utf8_range to version with working pkg-config (#12584)
* Mark update script executable * Squashed 'third_party/utf8_range/' changes from 72c943dea..cd1507d14 cd1507d14 Fix typo in pkg-config file to properly link the utf8_range libraries 3f179d134 Add pkg-config file declaring Abseil dependency of utf8_range git-subtree-dir: third_party/utf8_range git-subtree-split: cd1507d1479815fbcd8ff24dc05a978a62098bae
1 parent 2d48c60 commit b05ee4f

File tree

4 files changed

+24
-1
lines changed

4 files changed

+24
-1
lines changed

third_party/utf8_range/.github/workflows/bazel_tests.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,15 @@ jobs:
2929

3030
steps:
3131
- uses: actions/checkout@v2
32+
- name: Setup Bazel
33+
run: |
34+
echo "BAZEL=bazel" >> $GITHUB_ENV
35+
echo "USE_BAZEL_VERSION=5.1.1" >> $GITHUB_ENV
36+
- name: Setup Bazel (macOS)
37+
if: runner.os == 'macOS'
38+
run: echo "BAZEL=bazelisk" >> $GITHUB_ENV
3239
- name: Install dependencies
3340
run: sudo apt update && sudo apt install -y ${{ matrix.install }}
3441
if: matrix.install != ''
3542
- name: Run tests
36-
run: cd ${{ github.workspace }} && CC=${{ matrix.CC }} bazel test --test_output=errors ... ${{ matrix.flags }}
43+
run: cd ${{ github.workspace }} && CC=${{ matrix.CC }} ${{ env.BAZEL }} test --test_output=errors ... ${{ matrix.flags }}

third_party/utf8_range/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ if (utf8_range_ENABLE_INSTALL)
7373
install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
7474
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
7575
)
76+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/utf8_range.pc.cmake
77+
${CMAKE_CURRENT_BINARY_DIR}/utf8_range.pc @ONLY)
78+
install(
79+
FILES ${CMAKE_CURRENT_BINARY_DIR}/utf8_range.pc
80+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
7681

7782
# Install public headers explicitly.
7883
install(FILES utf8_range.h utf8_validity.h
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
prefix=@CMAKE_INSTALL_PREFIX@
2+
exec_prefix=@CMAKE_INSTALL_PREFIX@
3+
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
4+
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
5+
6+
Name: UTF8 Range
7+
Description: Google's UTF8 Library
8+
Version: 1.0
9+
Requires: absl_strings
10+
Libs: -L${libdir} -lutf8_validity -lutf8_range @CMAKE_THREAD_LIBS_INIT@
11+
Cflags: -I${includedir}

update_subtrees.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)