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

Use system rapidjson, fall back to bundled. #119

Merged
merged 1 commit into from
Jun 21, 2024
Merged

Use system rapidjson, fall back to bundled. #119

merged 1 commit into from
Jun 21, 2024

Commits on May 2, 2024

  1. Use system rapidjson, fall back to bundled. 

    Currently the `rapidjson` headers are hard-coded into
`davix_gcloud_utils.cpp` in a way that makes it difficult to use
external/system provided rapidjson headers rather than the bundled ones.

This commit uses `find_package` to look for an external instance of
rapidjson, falling back to the bundled version in `src/libs/rapidjson`
if that search fails. In either case, it sets up the variable
`RAPIDJSON_INCLUDE_DIRS` pointing to the location of the headers and
adds this to the list of `DAVIX_INTERNAL_INCLUDES` to allow the location
to be included during compilation (via `-I${RAPIDJSON_INCLUDE_DIRS}`).
Finally, it modifies the `#include` in `davix_gcloud_utils.cpp` to
support a generic location.
    @badshah400
    badshah400 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    3210930 View commit details
    Browse the repository at this point in the history