Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xbox NXDK: Use diasurgical fork of libfmt #5011

Merged
merged 1 commit into from
Jul 16, 2022
Merged

Xbox NXDK: Use diasurgical fork of libfmt #5011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions 3rdParty/libfmt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,16 @@ else()
set(BUILD_SHARED_LIBS ON)
endif()
include(FetchContent)
FetchContent_Declare(libfmt
URL https://github.com/fmtlib/fmt/archive/22d31b31f0e9b4e4654ba67ee881f3564c2cc297.tar.gz
URL_HASH MD5=d4e8744846cb9e94a80aca932ed2d5c0
)
if(NXDK)
# branch: nxdk-2022-07-19
FetchContent_Declare(libfmt
URL https://github.com/diasurgical/fmt/archive/16d67608437f4fb9d293e561b4ddbccf3815a097.tar.gz
URL_HASH MD5=7ef45573ef301c250717c60458aa7536
)
else()
FetchContent_Declare(libfmt
URL https://github.com/fmtlib/fmt/archive/22d31b31f0e9b4e4654ba67ee881f3564c2cc297.tar.gz
URL_HASH MD5=d4e8744846cb9e94a80aca932ed2d5c0
)
endif()
FetchContent_MakeAvailableExcludeFromAll(libfmt)
1 change: 1 addition & 0 deletions CMake/platforms/xbox_nxdk.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ set(UBSAN OFF)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/xbox_nxdk/finders")

set(DEVILUTIONX_SYSTEM_BZIP2 OFF)
set(DEVILUTIONX_SYSTEM_LIBFMT OFF)

set(BUILD_ASSETS_MPQ OFF)
set(DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/pkg/assets")
Expand Down
5 changes: 0 additions & 5 deletions CMake/platforms/xbox_nxdk/finders/Findfmt.cmake
View file
Open in desktop

This file was deleted.