Merge branch 'use-thirdparty-fmt' into 'master'

(Ubuntu fix) use libfmt from thirdparty/fmt

Closes #1278

See merge request KartKrew/Kart!2283
This commit is contained in:
Eidolon 2024-04-14 16:39:02 +00:00
commit 5e316f5364
4 changed files with 5 additions and 3 deletions

View file

@ -95,7 +95,8 @@ find_package(ZLIB REQUIRED)
find_package(PNG REQUIRED)
find_package(SDL2 CONFIG REQUIRED)
find_package(CURL REQUIRED)
find_package(FMT CONFIG REQUIRED)
# Use the one in thirdparty/fmt to guarantee a minimum version
#find_package(FMT CONFIG REQUIRED)
# libgme defaults to "Nuked" YM2612 emulator, which is
# very SLOW. The system library probably uses the

View file

@ -268,7 +268,7 @@ target_link_libraries(SRB2SDL2 PRIVATE glm::glm)
target_link_libraries(SRB2SDL2 PRIVATE Stb)
target_link_libraries(SRB2SDL2 PRIVATE xmp-lite::xmp-lite)
target_link_libraries(SRB2SDL2 PRIVATE glad::glad)
target_link_libraries(SRB2SDL2 PRIVATE fmt::fmt)
target_link_libraries(SRB2SDL2 PRIVATE fmt::fmt-header-only)
target_link_libraries(SRB2SDL2 PRIVATE imgui::imgui)
target_link_libraries(SRB2SDL2 PRIVATE Tracy::TracyClient)
if(SRB2_CONFIG_ENABLE_WEBM_MOVIES)

View file

@ -11,3 +11,5 @@ add_subdirectory(glad)
add_subdirectory(tracy)
add_subdirectory(libwebm)
add_subdirectory(fmt)

View file

@ -4,7 +4,6 @@
"version": "1.0.0",
"dependencies": [
"curl",
"fmt",
"sdl2",
"libpng",
"libogg",