Browse Source
[cmake] fix boost comp options, add rapidjson endian, clang/amd64 error
Signed-off-by: crueter <crueter@crueter.xyz>
pull/348/head
crueter
6 months ago
committed by
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
2 changed files with
18 additions and
0 deletions
-
.patch/boost/0003-armasm-options.patch
-
CMakeLists.txt
|
|
@ -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") |
|
|
|
|
|
|
|
|
@ -91,6 +91,7 @@ if (MSVC AND CXX_CLANG) |
|
|
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion> |
|
|
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion> |
|
|
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-reserved-identifier> |
|
|
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-reserved-identifier> |
|
|
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-deprecated-declarations> |
|
|
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-deprecated-declarations> |
|
|
|
|
|
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type-mismatch> |
|
|
) |
|
|
) |
|
|
|
|
|
|
|
|
if (ARCHITECTURE_x86_64) |
|
|
if (ARCHITECTURE_x86_64) |
|
|
@ -468,6 +469,10 @@ endif() |
|
|
|
|
|
|
|
|
# DiscordRPC |
|
|
# DiscordRPC |
|
|
if (USE_DISCORD_PRESENCE) |
|
|
if (USE_DISCORD_PRESENCE) |
|
|
|
|
|
if (ARCHITECTURE_arm64) |
|
|
|
|
|
add_compile_definitions(RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN) |
|
|
|
|
|
endif() |
|
|
|
|
|
|
|
|
AddJsonPackage(discord-rpc) |
|
|
AddJsonPackage(discord-rpc) |
|
|
|
|
|
|
|
|
target_include_directories(discord-rpc INTERFACE ${discord-rpc_SOURCE_DIR}/include) |
|
|
target_include_directories(discord-rpc INTERFACE ${discord-rpc_SOURCE_DIR}/include) |
|
|
|