Skip to content

Build using system utf8cpp when available #319

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

Merged
robUx4 merged 2 commits into from
May 11, 2025
Merged

Build using system utf8cpp when available #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73f29d3
use external utf8-cpp when it's available
robUx4 May 11, 2025
e133286
CI: add libutfcpp-dev in some Linux builds to test detection
robUx4 May 11, 2025
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
9 changes: 7 additions & 2 deletions .github/workflows/linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,19 @@ on:

jobs:
Latest:
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
strategy:
matrix:
cxx: ['g++-14', 'clang++-18']
env:
CMAKE_OPTIONS: -DDEV_MODE=ON -DBUILD_TESTING=ON -G Ninja
CXX: ${{matrix.cxx}}
steps:
- name: install utf8cpp
run: |
sudo apt-get update
sudo apt-get install -y --no-install-recommends libutfcpp-dev

- name: list compilers
run: dpkg --list | grep compiler

Expand Down Expand Up @@ -79,7 +84,7 @@ jobs:
branch: edge
arch: ${{matrix.platform}}
packages: >
build-base cmake
build-base cmake git

- name: Configure
run: cmake -S . -B _build ${{ env.CMAKE_OPTIONS }} -DCMAKE_INSTALL_PREFIX:STRING=${GITHUB_WORKSPACE}/_built
Expand Down
18 changes: 17 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,20 @@ function(add_cxx_flag_if_supported)
endforeach()
endfunction()

find_package(utf8cpp 3.2.0)
if(NOT utf8cpp_FOUND)
include(FetchContent REQUIRED)
FetchContent_Declare(
utf8cpp
GIT_REPOSITORY https://github.com/nemtrif/utfcpp.git
GIT_TAG v3.2.5
GIT_PROGRESS TRUE
DOWNLOAD_EXTRACT_TIMESTAMP ON
OVERRIDE_FIND_PACKAGE
)
FetchContent_MakeAvailable(utf8cpp)
endif()

if(DEV_MODE)
message(STATUS "Using developer mode for ${CMAKE_CXX_COMPILER_ID}")
set(CMAKE_CXX_EXTENSIONS OFF)
Expand Down Expand Up @@ -123,6 +137,8 @@ if(WIN32)
target_compile_definitions(ebml PRIVATE _CRT_SECURE_NO_WARNINGS)
endif()

target_link_libraries(ebml PRIVATE $<BUILD_INTERFACE:utf8cpp>)

if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20")
if(${CMAKE_CXX_BYTE_ORDER} STREQUAL "BIG_ENDIAN")
set(BUILD_BIG_ENDIAN 1)
Expand Down Expand Up @@ -237,4 +253,4 @@ endif()

feature_summary(DESCRIPTION "libebml options:" WHAT ENABLED_FEATURES)
feature_summary(DESCRIPTION "libebml disabled options:" WHAT DISABLED_FEATURES)
# feature_summary(DESCRIPTION "libebml packages used:" WHAT PACKAGES_FOUND)
feature_summary(DESCRIPTION "libebml packages used:" WHAT PACKAGES_FOUND)
2 changes: 1 addition & 1 deletion src/EbmlUnicodeString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "ebml/EbmlUnicodeString.h"

#include "lib/utf8-cpp/source/utf8/checked.h"
#include <utf8/checked.h>

#include <algorithm>
#include <cstring>
Expand Down
23 changes: 0 additions & 23 deletions src/lib/utf8-cpp/LICENSE
View file
Open in desktop

This file was deleted.

2,131 changes: 0 additions & 2,131 deletions src/lib/utf8-cpp/README.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/lib/utf8-cpp/git-info.txt
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions src/lib/utf8-cpp/source/utf8.h
View file
Open in desktop

This file was deleted.

Loading