Skip to content

Commit

Permalink
update static glib version
Browse files Browse the repository at this point in the history
  • Loading branch information
svirpioj committed Oct 11, 2023
1 parent 7ac3f8e commit 5220e8e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Makefile
Expand Up @@ -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 -xf deps/glib-2.78.0.tar.xz
( \
cd deps/glib-2.63.6; \
cd deps/glib-2.78.0; \
meson build --default-library static; \
ninja -C build; \
)
Expand Down
8 changes: 4 additions & 4 deletions cmake/FindGlib2.cmake
Expand Up @@ -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)

Expand Down

0 comments on commit 5220e8e

Please sign in to comment.