From ac2be759a49be5e04634843fef23f41bba95a9ed Mon Sep 17 00:00:00 2001
From: wangli28 <47812810+wangli28@users.noreply.github.com>
Date: Wed, 17 Jul 2019 12:49:49 +0800
Subject: [rapidjson] Fix path RapidJSON_INCLUDE_DIRS (#7273)

* [rapidjson] Fix path RapidJSON_INCLUDE_DIRS

* [bond] Fix error hash
---
 ports/rapidjson/CONTROL        |  2 +-
 ports/rapidjson/portfile.cmake | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'ports/rapidjson')

diff --git a/ports/rapidjson/CONTROL b/ports/rapidjson/CONTROL
index b3c0f60b5..53d344628 100644
--- a/ports/rapidjson/CONTROL
+++ b/ports/rapidjson/CONTROL
@@ -1,4 +1,4 @@
 Source: rapidjson
-Version: d87b698  
+Version: d87b698-1
 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/portfile.cmake b/ports/rapidjson/portfile.cmake
index 4f3529f5b..7438c0e33 100644
--- a/ports/rapidjson/portfile.cmake
+++ b/ports/rapidjson/portfile.cmake
@@ -32,9 +32,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug ${
 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)
 
-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()
+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
-- 
cgit v1.2.3