From 6ac9c03ec46d221ce094a893d9f6d5f561e175fd Mon Sep 17 00:00:00 2001 From: Daniel Dada Date: Fri, 19 Dec 2025 10:11:13 +0300 Subject: [PATCH] fixed linux deps --- cmake/Dependencies.cmake | 14 +++++++------- src/core/common/version.hpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index f8aa1db..1d2bfc5 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -7,13 +7,7 @@ if(WIN32) freetype URL https://download.savannah.gnu.org/releases/freetype/freetype-2.14.1.tar.gz ) - - set(FT_DISABLE_ZLIB FALSE CACHE BOOL "" FORCE) - set(FT_DISABLE_BZIP2 TRUE CACHE BOOL "" FORCE) - set(FT_DISABLE_PNG TRUE CACHE BOOL "" FORCE) - set(FT_DISABLE_HARFBUZZ FALSE CACHE BOOL "" FORCE) - set(FT_DISABLE_BROTLI TRUE CACHE BOOL "" FORCE) - + FetchContent_MakeAvailable(freetype) elseif(APPLE) option(USE_SYSTEM_GLFW ON) @@ -33,6 +27,8 @@ else() find_package(ZLIB REQUIRED) find_package(BZip2 REQUIRED) find_package(PNG REQUIRED) + find_library(BROTLIDEC_LIBRARY NAMES brotlidec) + find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon) pkg_check_modules(HARFBUZZ harfbuzz) pkg_check_modules(WAYLAND_CLIENT wayland-client) pkg_check_modules(WAYLAND_EGL wayland-egl) @@ -76,6 +72,10 @@ else() endif() set(FREETYPE_EXTRA_LIBS "") +if(BROTLIDEC_LIBRARY AND BROTLICOMMON_LIBRARY) + list(APPEND FREETYPE_EXTRA_LIBS ${BROTLIDEC_LIBRARY} ${BROTLICOMMON_LIBRARY}) + message(STATUS "Found Brotli libraries") +endif() if(HARFBUZZ_FOUND) list(APPEND FREETYPE_EXTRA_LIBS ${HARFBUZZ_LIBRARIES}) message(STATUS "Found HarfBuzz") diff --git a/src/core/common/version.hpp b/src/core/common/version.hpp index 21776c3..9b55112 100644 --- a/src/core/common/version.hpp +++ b/src/core/common/version.hpp @@ -6,7 +6,7 @@ namespace clrsync::core { -const std::string GIT_SEMVER = "0.1.6+git.gece7c84"; +const std::string GIT_SEMVER = "0.1.7+git.g2a43348"; const std::string version_string(); } // namespace clrsync::core