-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge: update the third party packages to the latest releases
`gtest` and `gflags` are updated to their latest release. For `RapidJSON`, try to find a correct version as the last release is over two years old and there is a lot of recent pipeline failures. This PR also ensures for our usage RapidJSON that there is no problem with some compilers when building benchmarks (i.e., building Ginkgo with `-DGINKGO_BUILD_BENCHMARKS=ON`). The problem was that on some compilers, no constructor can be recognized for the RapidJSON `GenericValue` object with a parameter of type `std::size_t`. The fix used is to add an explicit version of our main function `add_or_set_member` for `std::size_t` which uses a `static_cast` to `std::uint64_t`. This is related to #270. Associated pull request: #274.
- Loading branch information
Showing
5 changed files
with
40 additions
and
11 deletions.
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
ginkgo_load_git_package(gflags_external | ||
"https://github.com/gflags/gflags.git" | ||
"660603a3df1c400437260b51c55490a046a12e8a" | ||
"-DBUILD_TESTING=OFF" "-DBUILD_gflags_LIB=OFF" "-DBUILD_gflags_nothreads_LIB=ON" "-DBUILD_STATIC_LIBS=ON") | ||
ginkgo_add_external_target(gflags gflags_nothreads build/include build/lib STATIC "" gflags_external FALSE) | ||
"e171aa2d15ed9eb17054558e0b3a6a413bb01067" | ||
"-DGFLAGS_BUILD_TESTING=OFF" "-DGFLAGS_BUILD_gflags_LIB=OFF" | ||
"-DGFLAGS_BUILD_gflags_nothreads_LIB=ON" "-DGFLAGS_BUILD_STATIC_LIBS=ON" | ||
"-DGFLAGS_BUILD_PACKAGING=OFF") | ||
ginkgo_add_external_target(gflags gflags_nothreads build/include build/lib STATIC "_debug" gflags_external FALSE) |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,9 @@ | ||
ginkgo_load_git_package(rapidjson_external | ||
"https://github.com/Tencent/rapidjson.git" | ||
"73063f5002612c6bf64fe24f851cd5cc0d83eef9" | ||
"8d272e53a4d1dc405e08ce2dd50159c58f4451e9" | ||
"-DRAPIDJSON_BUILD_DOC=OFF" "-DRAPIDJSON_BUILD_EXAMPLES=OFF" | ||
"-DRAPIDJSON_BUILD_TESTS=OFF" "-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF") | ||
"-DRAPIDJSON_BUILD_TESTS=OFF" "-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF" | ||
"-DRAPIDJSON_BUILD_CXX11=ON") | ||
# Remove directory with questionable licensing | ||
file(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/src/bin/jsonchecker) | ||
ginkgo_add_external_target(rapidjson rapidjson src/include "" STATIC "" rapidjson_external TRUE) |