Bump plutovg version to 0.0.2

sammycage · sammycage · commit b1eb7786f860 · 2024-09-05T03:31:52.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,8 +7,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          submodules: true
       - name: Build with meson
         run: |
           pip install meson
@@ -27,8 +25,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          submodules: true
       - name: Build with meson
         run: |
           pip install meson
@@ -47,8 +43,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          submodules: true
       - name: Build with meson
         run: |
           pip install meson
diff --git a/.gitmodules b/.gitmodules
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,16 @@ 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 v0.0.2
+    GIT_SHALLOW ON
+    FIND_PACKAGE_ARGS 0.0.2
+)
+
+FetchContent_MakeAvailable(plutovg)
+
 set(lunasvg_sources
     source/lunasvg.cpp
     source/graphics.cpp
@@ -32,11 +42,6 @@ set(lunasvg_headers
     source/svgtextelement.h
 )
 
-find_package(plutovg 0.0.1 QUIET)
-if(NOT plutovg_FOUND)
-    add_subdirectory(plutovg)
-endif()
-
 add_library(lunasvg ${lunasvg_sources} ${lunasvg_headers})
 add_library(lunasvg::lunasvg ALIAS lunasvg)
 
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ ninja -C build install
 ### Using CMake
 
 ```bash
-git clone --recursive https://github.com/sammycage/lunasvg.git
+git clone https://github.com/sammycage/lunasvg.git
 cd lunasvg
 cmake -B build .
 make -C build -j2
diff --git a/meson.build b/meson.build
@@ -7,6 +7,7 @@ project('lunasvg', 'cpp',
 
 plutovg_dep = dependency('plutovg',
     required: true,
+    version: '>=0.0.2',
     fallback: ['plutovg', 'plutovg_dep']
 )
 
diff --git a/plutovg b/plutovg
diff --git a/subprojects/plutovg.wrap b/subprojects/plutovg.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/sammycage/plutovg.git
-revision = head
+revision = v0.0.2
 depth = 1
 
 [provide]

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ project('lunasvg', 'cpp',`
`7`	`7`
`8`	`8`	`plutovg_dep = dependency('plutovg',`
`9`	`9`	`required: true,`
	`10`	`+ version: '>=0.0.2',`
`10`	`11`	`fallback: ['plutovg', 'plutovg_dep']`
`11`	`12`	`)`
`12`	`13`