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
diff --git a/.github/workflows/bazel_tests.yml b/.github/workflows/bazel_tests.yml index ae3e970..adf7118 100644 --- a/.github/workflows/bazel_tests.yml +++ b/.github/workflows/bazel_tests.yml
@@ -29,8 +29,15 @@ 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 }}
diff --git a/CMakeLists.txt b/CMakeLists.txt index 69a4d89..344952d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -73,6 +73,11 @@ 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
diff --git a/cmake/utf8_range.pc.cmake b/cmake/utf8_range.pc.cmake new file mode 100644 index 0000000..64b4b77 --- /dev/null +++ b/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}