Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ jobs:
name: libebml for Linux
runs-on: ubuntu-latest
steps:
- name: install utf8cpp
run: |
sudo apt-get update
sudo apt-get install -y --no-install-recommends libutfcpp-dev

- name: Get pushed code
uses: actions/checkout@v4
Expand Down
18 changes: 17 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,20 @@ include(GNUInstallDirs)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

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()

set(libebml_SOURCES
src/Debug.cpp
src/EbmlBinary.cpp
Expand Down Expand Up @@ -116,6 +130,8 @@ if(MSVC)
target_compile_definitions(ebml PRIVATE _CRT_SECURE_NO_WARNINGS)
endif()

target_link_libraries(ebml PRIVATE $<BUILD_INTERFACE:utf8cpp>)

include(GenerateExportHeader)
generate_export_header(ebml EXPORT_MACRO_NAME EBML_DLL_API)
target_sources(ebml
Expand Down Expand Up @@ -176,4 +192,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
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

#include "ebml/EbmlUnicodeString.h"

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

namespace libebml {

Expand Down
1,503 changes: 0 additions & 1,503 deletions src/lib/utf8-cpp/README.md

This file was deleted.

1 change: 0 additions & 1 deletion src/lib/utf8-cpp/git-info.txt

This file was deleted.

34 changes: 0 additions & 34 deletions src/lib/utf8-cpp/source/utf8.h

This file was deleted.

Loading