3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 14:58:00 +08:00
Code Issues Projects Releases Wiki Activity

[rapidjson] Fix #error on arm64

Browse Source
This commit is contained in:
Robert Schumacher 2018-10-22 03:43:11 -07:00
parent 854a1e474e
commit 9cb0f3c8ae
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/rapidjson/CONTROL
View File

@ -1,3 +1,3 @@
Source: rapidjson
Version: 1.1.0-1
Version: 1.1.0-2
Description: A fast JSON parser/generator for C++ with both SAX/DOM style API <http://rapidjson.org/>

13
ports/rapidjson/arm64-endian.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/include/rapidjson/rapidjson.h b/include/rapidjson/rapidjson.h
index 053b2ce..1e0b8f3 100644
--- a/include/rapidjson/rapidjson.h
+++ b/include/rapidjson/rapidjson.h
@@ -236,7 +236,7 @@
# define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN
# elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)
# define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
-# elif defined(_MSC_VER) && defined(_M_ARM)
+# elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_ARM64))
# define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN
# elif defined(RAPIDJSON_DOXYGEN_RUNNING)
# define RAPIDJSON_ENDIAN

1
ports/rapidjson/portfile.cmake
View File

@ -7,6 +7,7 @@ vcpkg_from_github(
REF v1.1.0
SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
HEAD_REF master
PATCHES arm64-endian.patch
)
# Use RapidJSON's own build process, skipping examples and tests

2
ports/rapidjson/usage
View File

@ -1,4 +1,4 @@
The package rapidjson provides CMake integration:
find_package(RapidJSON REQUIRED)
find_package(RapidJSON CONFIG REQUIRED)
target_include_directories(main PRIVATE ${RAPIDJSON_INCLUDE_DIRS})