diff options
| author | Nicole Mazzuca <t-nimaz@microsoft.com> | 2019-07-19 12:17:22 -0700 |
|---|---|---|
| committer | Nicole Mazzuca <t-nimaz@microsoft.com> | 2019-07-19 12:17:22 -0700 |
| commit | b3caf67749f21952e0157ba77ece755aa01b254a (patch) | |
| tree | dff6a178b506fdc58e28bbc9094f1687eb99bd72 /ports/rapidjson | |
| parent | fddebb75da034752fb267ba121497ba58157bb79 (diff) | |
| parent | 618fa203c13c30bd19826988cff66481bca0562f (diff) | |
| download | vcpkg-b3caf67749f21952e0157ba77ece755aa01b254a.tar.gz vcpkg-b3caf67749f21952e0157ba77ece755aa01b254a.zip | |
Merge branch 'trunk' into parallel-file-ops
Diffstat (limited to 'ports/rapidjson')
| -rw-r--r-- | ports/rapidjson/CONTROL | 2 | ||||
| -rw-r--r-- | ports/rapidjson/portfile.cmake | 10 |
2 files changed, 5 insertions, 7 deletions
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 |