Skip to content

Commit

Permalink
Merge pull request #208 from WerWolv/better_plutovg_lib_include
Browse files Browse the repository at this point in the history
Added back plutovg as a submodule, added option to use system version
  • Loading branch information
sammycage authored Jan 31, 2025
2 parents 651bef6 + 71c4d5a commit 5fccfc8
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
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

0 comments on commit 5fccfc8

Please sign in to comment.