d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 03:00:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1376 from xvitaly/blurhash

Browse source 
Added ability to build with packaged version of blurhash
This commit is contained in:
DeepBlueV7.X 2023-02-17 21:22:45 +01:00 committed by GitHub
commit 2a380eeae6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
CMakeLists.txt
View file

@ -63,6 +63,7 @@ option(USE_BUNDLED_LIBEVENT "Use the bundled version of libevent." ${HUNTER_ENAB
option(USE_BUNDLED_LIBCURL "Use the bundled version of libcurl." ${HUNTER_ENABLED}) option(USE_BUNDLED_LIBCURL "Use the bundled version of libcurl." ${HUNTER_ENABLED})
option(USE_BUNDLED_RE2 "Use the bundled version of re2." ${HUNTER_ENABLED}) option(USE_BUNDLED_RE2 "Use the bundled version of re2." ${HUNTER_ENABLED})
option(USE_BUNDLED_CPPHTTPLIB "Use the bundled version of cpp-httplib." ON) option(USE_BUNDLED_CPPHTTPLIB "Use the bundled version of cpp-httplib." ON)
option(USE_BUNDLED_BLURHASH "Use the bundled version of blurhash." ON)
include(CMakeDependentOption) include(CMakeDependentOption)
set(VOIP_DEFAULT ON) set(VOIP_DEFAULT ON)
@ -698,12 +699,7 @@ else()
endif() endif()
endif() endif()
target_include_directories(nheko PRIVATE src includes third_party/blurhash) target_include_directories(nheko PRIVATE src includes)
set(THIRD_PARTY_SRC_FILES
third_party/blurhash/blurhash.cpp
third_party/blurhash/blurhash.hpp
)
target_sources(nheko PRIVATE ${THIRD_PARTY_SRC_FILES})
if (USE_BUNDLED_CPPHTTPLIB) if (USE_BUNDLED_CPPHTTPLIB)
target_include_directories(nheko PRIVATE third_party/cpp-httplib-0.5.12) target_include_directories(nheko PRIVATE third_party/cpp-httplib-0.5.12)
@ -713,6 +709,19 @@ else()
target_link_libraries(nheko PRIVATE httplib::httplib) target_link_libraries(nheko PRIVATE httplib::httplib)
endif() endif()
if (USE_BUNDLED_BLURHASH)
target_include_directories(nheko PRIVATE third_party/blurhash)
set(BLURHASH_SRC_FILES
third_party/blurhash/blurhash.cpp
third_party/blurhash/blurhash.hpp
)
target_sources(nheko PRIVATE ${BLURHASH_SRC_FILES})
else()
find_package(PkgConfig REQUIRED)
pkg_check_modules(blurhash REQUIRED IMPORTED_TARGET blurhash)
target_link_libraries(nheko PRIVATE PkgConfig::blurhash)
endif()
# Fixup bundled keychain include dirs # Fixup bundled keychain include dirs
if (USE_BUNDLED_QTKEYCHAIN) if (USE_BUNDLED_QTKEYCHAIN)
target_include_directories(nheko PRIVATE ${qt5keychain_SOURCE_DIR} ${qt5keychain_BINARY_DIR}) target_include_directories(nheko PRIVATE ${qt5keychain_SOURCE_DIR} ${qt5keychain_BINARY_DIR})