Skip to content

Commit

Permalink
Bump utf8_range to version with working pkg-config (#12584)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
mkruskal-google committed Apr 27, 2023
1 parent 2d48c60 commit b05ee4f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 1 deletion.
9 changes: 8 additions & 1 deletion third_party/utf8_range/.github/workflows/bazel_tests.yml
Expand Up @@ -29,8 +29,15 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Setup Bazel
run: |
echo "BAZEL=bazel" >> $GITHUB_ENV
echo "USE_BAZEL_VERSION=5.1.1" >> $GITHUB_ENV
- name: Setup Bazel (macOS)
if: runner.os == 'macOS'
run: echo "BAZEL=bazelisk" >> $GITHUB_ENV
- name: Install dependencies
run: sudo apt update && sudo apt install -y ${{ matrix.install }}
if: matrix.install != ''
- name: Run tests
run: cd ${{ github.workspace }} && CC=${{ matrix.CC }} bazel test --test_output=errors ... ${{ matrix.flags }}
run: cd ${{ github.workspace }} && CC=${{ matrix.CC }} ${{ env.BAZEL }} test --test_output=errors ... ${{ matrix.flags }}
5 changes: 5 additions & 0 deletions third_party/utf8_range/CMakeLists.txt
Expand Up @@ -73,6 +73,11 @@ if (utf8_range_ENABLE_INSTALL)
install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/utf8_range.pc.cmake
${CMAKE_CURRENT_BINARY_DIR}/utf8_range.pc @ONLY)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/utf8_range.pc
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")

# Install public headers explicitly.
install(FILES utf8_range.h utf8_validity.h
Expand Down
11 changes: 11 additions & 0 deletions third_party/utf8_range/cmake/utf8_range.pc.cmake
@@ -0,0 +1,11 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@

Name: UTF8 Range
Description: Google's UTF8 Library
Version: 1.0
Requires: absl_strings
Libs: -L${libdir} -lutf8_validity -lutf8_range @CMAKE_THREAD_LIBS_INIT@
Cflags: -I${includedir}
Empty file modified update_subtrees.sh 100644 → 100755
Empty file.

0 comments on commit b05ee4f

Please sign in to comment.