Use system rapidjson, fall back to bundled. #119
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
|
I have tested this both with and without system installed rapidjson. |
|
Thanks! Added to Cheers, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently the
rapidjsonheaders are hard-coded intodavix_gcloud_utils.cppin a way that makes it difficult to use external/system provided rapidjson headers rather than the bundled ones.This commit uses
find_packageto look for an external instance of rapidjson, falling back to the bundled version insrc/libs/rapidjsonif that search fails. In either case, it sets up the variableRAPIDJSON_INCLUDE_DIRSpointing to the location of the headers and adds this to the list ofDAVIX_INTERNAL_INCLUDESto allow the location to be included during compilation (via-I${RAPIDJSON_INCLUDE_DIRS}). Finally, it modifies the#includeindavix_gcloud_utils.cppto support a generic location.