Merge branch 'master' into vcpkg_nuget

3 files changed, 11 insertions, 30 deletions

diff --git a/ports/rapidjson/CONTROL b/ports/rapidjson/CONTROL
index 02f7b5107..b0b944f01 100644
--- a/ports/rapidjson/CONTROL
+++ b/ports/rapidjson/CONTROL
@@ -1,4 +1,4 @@
 Source: rapidjson
-Version: 1.1.0-3
-Description: A fast JSON parser/generator for C++ with both SAX/DOM style API
-Homepage: http://rapidjson.org/
+Version: 2019-06-28
+Description: A fast JSON parser/generator for C++ with both SAX/DOM style API <http://rapidjson.org/>
+Homepage: http://rapidjson.org/
\ No newline at end of file
diff --git a/ports/rapidjson/arm64-endian.patch b/ports/rapidjson/arm64-endian.patch
deleted file mode 100644
index 81fd92132..000000000
--- a/ports/rapidjson/arm64-endian.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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

diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake
index 2e3787857..da251429d 100644
--- a/ports/rapidjson/portfile.cmake
+++ b/ports/rapidjson/portfile.cmake
@@ -4,10 +4,9 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Tencent/rapidjson
-    REF v1.1.0
-    SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
+    REF d87b698d0fcc10a5f632ecbc80a9cb2a8fa094a5
+    SHA512 1770668c954e1bfa40da3956ccf2252703d2addb058bb8c0bf579abac585262452d0e15dcfed9ac2fa358c0da305d706226fdab8310b584017aba98e4f31db4f
     HEAD_REF master
-    PATCHES arm64-endian.patch
 )
 
 # Use RapidJSON's own build process, skipping examples and tests
@@ -22,19 +21,14 @@ vcpkg_configure_cmake(
 )
 vcpkg_install_cmake()
 
-# Move CMake config files to the right place
 vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 
-# Delete redundant directories
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/doc)
 
-# Put the licence file where vcpkg expects it
-file(COPY ${SOURCE_PATH}/license.txt ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/rapidjson)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/rapidjson/license.txt ${CURRENT_PACKAGES_DIR}/share/rapidjson/copyright)
+file(READ "${CURRENT_PACKAGES_DIR}/share/rapidjson/RapidJSONConfig.cmake" _contents)
+string(REPLACE "\${RapidJSON_SOURCE_DIR}" "\${RapidJSON_CMAKE_DIR}/../.." _contents "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/rapidjson/RapidJSONConfig.cmake" "${_contents}\nset(RAPIDJSON_INCLUDE_DIRS \"\${RapidJSON_INCLUDE_DIRS}\")\n")
+
+file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 
-if(VCPKG_USE_HEAD_VERSION)
-    file(READ "${CURRENT_PACKAGES_DIR}/share/rapidjson/RapidJSONConfig.cmake" _contents)
-    string(REPLACE "\${RapidJSON_SOURCE_DIR}" "\${RapidJSON_CMAKE_DIR}/../.." _contents "${_contents}")
-    file(WRITE "${CURRENT_PACKAGES_DIR}/share/rapidjson/RapidJSONConfig.cmake" "${_contents}\nset(RAPIDJSON_INCLUDE_DIRS \"\${RapidJSON_INCLUDE_DIRS}\")\n")
-    # Note: adding this extra setting for RAPIDJSON_INCLUDE_DIRS maintains compatibility with previous rapidjson versions
-endif()