Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compatibility patch for latest RapidJSON #567

Merged
merged 2 commits into from
May 24, 2024
Merged

Compatibility patch for latest RapidJSON #567

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c5e1e4
Compatibility patch for latest RapidJSON
hcho3 May 24, 2024
f6ac4cd
Use latest RapidJSON
hcho3 May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions cmake/ExternalLibs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,21 @@ add_library(rapidjson INTERFACE)
target_compile_definitions(rapidjson INTERFACE -DRAPIDJSON_HAS_STDSTRING=1)
find_package(RapidJSON)
if(RapidJSON_FOUND)
target_include_directories(rapidjson INTERFACE ${RAPIDJSON_INCLUDE_DIRS})
if(DEFINED RAPIDJSON_INCLUDE_DIRS)
# Compatibility with 1.1.0 stable (circa 2016)
set(RapidJSON_include_dir "${RAPIDJSON_INCLUDE_DIRS}")
else()
# Latest RapidJSON (1.1.0.post*)
set(RapidJSON_include_dir "${RapidJSON_INCLUDE_DIRS}")
endif()
target_include_directories(rapidjson INTERFACE ${RapidJSON_include_dir})
message(STATUS "Found RapidJSON: ${RapidJSON_include_dir}")
else()
message(STATUS "Did not find RapidJSON in the system root. Fetching RapidJSON now...")
FetchContent_Declare(
RapidJSON
GIT_REPOSITORY https://github.com/Tencent/rapidjson
GIT_TAG v1.1.0
GIT_TAG ab1842a2dae061284c0a62dca1cc6d5e7e37e346
)
FetchContent_Populate(RapidJSON)
message(STATUS "RapidJSON was downloaded at ${rapidjson_SOURCE_DIR}.")
Expand Down
Loading