From a13ea11e57213c208b4adb7cd658ed4a251ab437 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Mon, 11 Aug 2025 09:16:49 +0200 Subject: [PATCH] Fix cmark loading on macos --- CMakeLists.txt | 10 +++------- im.nheko.Nheko.yaml | 6 ++++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ff134c5..8c085417 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -562,16 +562,12 @@ if(USE_BUNDLED_CMARK) FetchContent_Declare( cmark GIT_REPOSITORY https://github.com/commonmark/cmark.git - GIT_TAG 0.30.2 - CMAKE_ARGS "CMARK_STATIC=ON CMARK_SHARED=OFF CMARK_TESTS=OFF CMARK_TESTS=OFF" + GIT_TAG 0.31.1 + CMAKE_ARGS "BUILD_TESTING=OFF" ) FetchContent_MakeAvailable(cmark) if (NOT TARGET cmark::cmark) - if(MSVC) - add_library(cmark::cmark ALIAS cmark) - else() - add_library(cmark::cmark ALIAS cmark_static) - endif() + add_library(cmark::cmark ALIAS cmark) endif() else() find_package(cmark REQUIRED 0.29.0) diff --git a/im.nheko.Nheko.yaml b/im.nheko.Nheko.yaml index a773c5ba..b7bc6dee 100644 --- a/im.nheko.Nheko.yaml +++ b/im.nheko.Nheko.yaml @@ -70,10 +70,12 @@ modules: config-opts: - -DCMAKE_BUILD_TYPE=Release - -DCMARK_TESTS=OFF + - -DBUILD_TESTING=OFF + - -DBUILD_SHARED_LIBS=OFF sources: - - sha256: bbcb8f8c03b5af33fcfcf11a74e9499f20a9043200b8552f78a6e8ba76e04d11 + - sha256: 3da93db5469c30588cfeb283d9d62edfc6ded9eb0edc10a4f5bbfb7d722ea802 type: archive - url: https://github.com/commonmark/cmark/archive/0.31.0.tar.gz + url: https://github.com/commonmark/cmark/archive/0.31.1.tar.gz - name: fmt buildsystem: cmake-ninja config-opts: