From a1e825ef4b140d79086345dbbf6dbfb029b8f3c1 Mon Sep 17 00:00:00 2001 From: Sami Virpioja Date: Wed, 11 Oct 2023 11:57:52 +0300 Subject: [PATCH] update static glib version --- Makefile | 8 ++++---- cmake/FindGlib2.cmake | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 426fb14..1622984 100644 --- a/Makefile +++ b/Makefile @@ -42,11 +42,11 @@ download-build-static-deps: cd deps/re2-2020-06-01; CXXFLAGS="-fPIC" make @echo "Downloading and building glib2" - curl -L -o deps/glib-2.63.6.tar.gz \ - https://github.com/GNOME/glib/archive/2.63.6.tar.gz - tar -C deps -xf deps/glib-2.63.6.tar.gz + curl -L -o deps/glib-2.78.0.tar.xz \ + https://download.gnome.org/sources/glib/2.78/glib-2.78.0.tar.xz + tar -C deps -xJf deps/glib-2.78.0.tar.gz ( \ - cd deps/glib-2.63.6; \ + cd deps/glib-2.78.0; \ meson build --default-library static; \ ninja -C build; \ ) diff --git a/cmake/FindGlib2.cmake b/cmake/FindGlib2.cmake index 6786069..be737fc 100644 --- a/cmake/FindGlib2.cmake +++ b/cmake/FindGlib2.cmake @@ -30,11 +30,11 @@ else() # BUILD_SHARED_LIBS # Search for static library from deps set( Glib2_INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/deps/glib-2.63.6 - ${CMAKE_SOURCE_DIR}/deps/glib-2.63.6/glib - ${CMAKE_SOURCE_DIR}/deps/glib-2.63.6/build/glib + ${CMAKE_SOURCE_DIR}/deps/glib-2.78.0 + ${CMAKE_SOURCE_DIR}/deps/glib-2.78.0/glib + ${CMAKE_SOURCE_DIR}/deps/glib-2.78.0/build/glib ) -set(Glib2_LIBRARIES ${CMAKE_SOURCE_DIR}/deps/glib-2.63.6/build/glib/libglib-2.0.a) +set(Glib2_LIBRARIES ${CMAKE_SOURCE_DIR}/deps/glib-2.78.0/build/glib/libglib-2.0.a) add_library(glib-2.0::glib-2.0 STATIC IMPORTED) set(Glib2_FOUND ON)