Merge pull request #8198 from mazes-80/system-fmt

Build system: default to fmt shared library when available
This commit is contained in:
Léo Lam 2020-03-15 14:36:28 +01:00 committed by GitHub
commit 97aaee1577
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions

View File

@ -532,7 +532,13 @@ if (_M_X86)
add_subdirectory(Externals/Bochs_disasm) add_subdirectory(Externals/Bochs_disasm)
endif() endif()
add_subdirectory(Externals/cpp-optparse) add_subdirectory(Externals/cpp-optparse)
add_subdirectory(Externals/fmt EXCLUDE_FROM_ALL) find_package(fmt 6.0)
if(fmt_FOUND)
message(STATUS "Using shared fmt ${fmt_VERSION}")
else()
message(STATUS "Using static fmt from Externals")
add_subdirectory(Externals/fmt EXCLUDE_FROM_ALL)
endif()
add_subdirectory(Externals/glslang) add_subdirectory(Externals/glslang)
add_subdirectory(Externals/imgui) add_subdirectory(Externals/imgui)