Skip to content
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.

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

Added back plutovg as a submodule, added option to use system version #208

Merged
merged 3 commits into from
Jan 31, 2025
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
6 changes: 6 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: true
- name: Build with meson
run: |
pip install meson
Expand All @@ -25,6 +27,8 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: true
- name: Build with meson
run: |
pip install meson
Expand All @@ -43,6 +47,8 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: true
- name: Build with meson
run: |
pip install meson
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "plutovg"]
path = plutovg
url = https://github.com/sammycage/plutovg.git
13 changes: 4 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,10 @@ set(LUNASVG_VERSION_MICRO 0)

project(lunasvg LANGUAGES CXX VERSION ${LUNASVG_VERSION_MAJOR}.${LUNASVG_VERSION_MINOR}.${LUNASVG_VERSION_MICRO})

include(FetchContent)
FetchContent_Declare(plutovg
GIT_REPOSITORY https://github.com/sammycage/plutovg.git
GIT_TAG main
GIT_SHALLOW ON
FIND_PACKAGE_ARGS 0.0.4
)

FetchContent_MakeAvailable(plutovg)
find_package(plutovg 0.0.4 QUIET)
if(NOT plutovg_FOUND)
add_subdirectory(plutovg)
endif()

set(lunasvg_sources
source/lunasvg.cpp
Expand Down
1 change: 1 addition & 0 deletions plutovg
Submodule plutovg added at e026d0
Loading