From 34b37e65e126cfeb560c13b0d2de08918ca61439 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Tue, 12 Nov 2024 20:53:57 +0000 Subject: [PATCH] Use `FetchContent` for PugiXML --- cmake/Libraries.cmake | 10 +++++++++- config.yaml | 4 ---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake index a89c7dcea4d..81fc6acd0a5 100644 --- a/cmake/Libraries.cmake +++ b/cmake/Libraries.cmake @@ -1,3 +1,5 @@ +include(FetchContent) + set(LIBEI_MIN_VERSION 1.2.1) set(LIBPORTAL_MIN_VERSION 0.6) @@ -110,7 +112,13 @@ macro(configure_unix_libs) configure_xorg_libs() configure_wayland_libs() - find_package(pugixml REQUIRED) + set(FETCHCONTENT_FULLY_DISCONNECTED ON) + FetchContent_Declare( + pugixml + GIT_REPOSITORY https://github.com/zeux/pugixml.git + GIT_TAG v1.13 + ) + FetchContent_MakeAvailable(pugixml) find_package(PkgConfig) if(PKG_CONFIG_FOUND) diff --git a/config.yaml b/config.yaml index fa477043e7c..c9998e8c968 100644 --- a/config.yaml +++ b/config.yaml @@ -48,7 +48,6 @@ config: libgtk-3-dev \ libgtest-dev \ libgmock-dev \ - libpugixml-dev \ libei-dev \ libportal-dev optional: [libei-dev, libportal-dev] @@ -80,7 +79,6 @@ config: gtk3-devel \ gtest-devel \ gmock-devel \ - pugixml-devel \ libei-devel \ libportal-devel optional: [libei-devel, libportal-devel] @@ -126,7 +124,6 @@ config: gtk3-devel \ googletest-devel \ googlemock-devel \ - pugixml-devel \ libei-devel \ libportal-devel @@ -144,7 +141,6 @@ config: libnotify \ libxkbfile \ gtest \ - pugixml \ libei \ libportal \ qt6-base \