From 21b56f5208c9a5085032a7d127b8eef19172c4f2 Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 8 Sep 2025 01:24:04 -0400 Subject: [PATCH] [cmake] fix boost comp options, add rapidjson endian, clang/amd64 error Signed-off-by: crueter --- .patch/boost/0003-armasm-options.patch | 13 +++++++++++++ CMakeLists.txt | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 .patch/boost/0003-armasm-options.patch diff --git a/.patch/boost/0003-armasm-options.patch b/.patch/boost/0003-armasm-options.patch new file mode 100644 index 0000000000..effdaa48bc --- /dev/null +++ b/.patch/boost/0003-armasm-options.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8210f65..108ac88 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -174,7 +174,7 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext") + + set(IMPL_SOURCES ${ASM_SOURCES} src/fcontext.cpp) + +- if(BOOST_CONTEXT_ASSEMBLER STREQUAL masm) ++ if(BOOST_CONTEXT_ASSEMBLER STREQUAL masm OR BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) + + set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/nologo") + diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c8c55b736..9d6903bfac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,6 +91,7 @@ if (MSVC AND CXX_CLANG) $<$:-Wno-sign-conversion> $<$:-Wno-reserved-identifier> $<$:-Wno-deprecated-declarations> + $<$:-Wno-cast-function-type-mismatch> ) if (ARCHITECTURE_x86_64) @@ -468,6 +469,10 @@ endif() # DiscordRPC if (USE_DISCORD_PRESENCE) + if (ARCHITECTURE_arm64) + add_compile_definitions(RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN) + endif() + AddJsonPackage(discord-rpc) target_include_directories(discord-rpc INTERFACE ${discord-rpc_SOURCE_DIR}/include)