mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-10-30 09:30:47 +03:00
Depend on libfmt explicitly
Since otherwise the include might not be visible and we need those now.
This commit is contained in:
parent
1aa15af11f
commit
0599444552
2 changed files with 22 additions and 3 deletions
|
@ -50,6 +50,7 @@ endmacro()
|
||||||
project(nheko LANGUAGES CXX C)
|
project(nheko LANGUAGES CXX C)
|
||||||
|
|
||||||
option(USE_BUNDLED_SPDLOG "Use the bundled version of spdlog." ${HUNTER_ENABLED})
|
option(USE_BUNDLED_SPDLOG "Use the bundled version of spdlog." ${HUNTER_ENABLED})
|
||||||
|
option(USE_BUNDLED_FMT "Use the bundled version of {fmt}." ${HUNTER_ENABLED})
|
||||||
option(USE_BUNDLED_OLM "Use the bundled version of libolm." ${HUNTER_ENABLED})
|
option(USE_BUNDLED_OLM "Use the bundled version of libolm." ${HUNTER_ENABLED})
|
||||||
option(USE_BUNDLED_GTEST "Use the bundled version of Google Test." ${HUNTER_ENABLED})
|
option(USE_BUNDLED_GTEST "Use the bundled version of Google Test." ${HUNTER_ENABLED})
|
||||||
option(USE_BUNDLED_CMARK "Use the bundled version of cmark." ${HUNTER_ENABLED})
|
option(USE_BUNDLED_CMARK "Use the bundled version of cmark." ${HUNTER_ENABLED})
|
||||||
|
@ -180,6 +181,12 @@ else()
|
||||||
pkg_check_modules(libcurl REQUIRED IMPORTED_TARGET libcurl)
|
pkg_check_modules(libcurl REQUIRED IMPORTED_TARGET libcurl)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# fmt
|
||||||
|
if(USE_BUNDLED_FMT)
|
||||||
|
hunter_add_package_safe(fmt)
|
||||||
|
endif()
|
||||||
|
find_package(fmt 8.0.0 CONFIG REQUIRED)
|
||||||
|
|
||||||
# spdlog
|
# spdlog
|
||||||
if(USE_BUNDLED_SPDLOG)
|
if(USE_BUNDLED_SPDLOG)
|
||||||
hunter_add_package_safe(spdlog)
|
hunter_add_package_safe(spdlog)
|
||||||
|
@ -896,6 +903,7 @@ target_link_libraries(nheko PRIVATE
|
||||||
${COEURL_TARGET_NAME}
|
${COEURL_TARGET_NAME}
|
||||||
MatrixClient::MatrixClient
|
MatrixClient::MatrixClient
|
||||||
cmark::cmark
|
cmark::cmark
|
||||||
|
fmt::fmt
|
||||||
spdlog::spdlog
|
spdlog::spdlog
|
||||||
Qt::Widgets
|
Qt::Widgets
|
||||||
Qt::Svg
|
Qt::Svg
|
||||||
|
|
|
@ -74,13 +74,24 @@ modules:
|
||||||
- sha256: bbcb8f8c03b5af33fcfcf11a74e9499f20a9043200b8552f78a6e8ba76e04d11
|
- sha256: bbcb8f8c03b5af33fcfcf11a74e9499f20a9043200b8552f78a6e8ba76e04d11
|
||||||
type: archive
|
type: archive
|
||||||
url: https://github.com/commonmark/cmark/archive/0.31.0.tar.gz
|
url: https://github.com/commonmark/cmark/archive/0.31.0.tar.gz
|
||||||
|
- name: fmt
|
||||||
|
buildsystem: cmake-ninja
|
||||||
|
config-opts:
|
||||||
|
- -DCMAKE_BUILD_TYPE=Release
|
||||||
|
- -DFMT_DOC=OFF
|
||||||
|
- -DFMT_TEST=OFF
|
||||||
|
sources:
|
||||||
|
- sha256: 40fc58bebcf38c759e11a7bd8fdc163507d2423ef5058bba7f26280c5b9c5465
|
||||||
|
type: archive
|
||||||
|
url: https://github.com/fmtlib/fmt/releases/download/11.0.2/fmt-11.0.2.zip
|
||||||
- name: spdlog
|
- name: spdlog
|
||||||
buildsystem: cmake-ninja
|
buildsystem: cmake-ninja
|
||||||
config-opts:
|
config-opts:
|
||||||
- -DCMAKE_BUILD_TYPE=Release
|
- -DCMAKE_BUILD_TYPE=Release
|
||||||
- -DSPDLOG_BUILD_EXAMPLES=0
|
- -DSPDLOG_BUILD_BENCH=OFF
|
||||||
- -DSPDLOG_BUILD_BENCH=0
|
- -DSPDLOG_BUILD_TESTING=OFF
|
||||||
- -DSPDLOG_BUILD_TESTING=0
|
- -DSPDLOG_BUILD_EXAMPLE=OFF
|
||||||
|
- -DSPDLOG_FMT_EXTERNAL=ON
|
||||||
sources:
|
sources:
|
||||||
- sha256: 1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b
|
- sha256: 1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b
|
||||||
type: archive
|
type: archive
|
||||||
|
|
Loading…
Reference in a new issue