fix fmt on macOS

fcitx-contrib · Dec 25, 2023 · afaf2e3 · afaf2e3
1 parent 671c565
commit afaf2e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,10 @@ find_package(Gettext REQUIRED)
 find_package(Fcitx5Core 5.0.0 REQUIRED)
 find_package(Fcitx5Module REQUIRED COMPONENTS Spell TestFrontend)
 find_package(PkgConfig REQUIRED)
-find_package(fmt REQUIRED)
+
+if (NOT TARGET fmt::fmt)
+    find_package(fmt REQUIRED)
+endif()
 
 if (NOT DEFINED MARISA_TARGET)
     pkg_check_modules(Marisa REQUIRED IMPORTED_TARGET marisa)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_library(hallelujah MODULE hallelujah.cpp)
-target_link_libraries(hallelujah Fcitx5::Core Fcitx5::Module::Spell fmt ${MARISA_TARGET} ${JSONC_TARGET})
+target_link_libraries(hallelujah Fcitx5::Core Fcitx5::Module::Spell fmt::fmt ${MARISA_TARGET} ${JSONC_TARGET})
 install(TARGETS hallelujah DESTINATION "${FCITX_INSTALL_LIBDIR}/fcitx5")
 fcitx5_translate_desktop_file(hallelujah.conf.in hallelujah.conf)
 configure_file(hallelujah-addon.conf.in.in hallelujah-addon.conf.in)