Skip to content

Commit

Permalink
[Test] Fetch rapidjson from github
Browse files Browse the repository at this point in the history
* Remove rapidjson source

Signed-off-by: Shen-Ta Hsieh <[email protected]>
  • Loading branch information
ibmibmibm authored and q82419 committed Jun 8, 2021
1 parent 80eb92e commit 74fd0ee
Show file tree
Hide file tree
Showing 40 changed files with 17 additions and 16,700 deletions.
9 changes: 0 additions & 9 deletions LICENSE.spdx
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,6 @@ PackageLicenseDeclared: BSD-3-Clause
FilesAnalyzed: false
PackageComment: <text>Only for testing.</text>

PackageName: rapidjson
SPDXID: SPDXRef-rapidjson
PackageFileName: ./thirdparty/rapidjson
PackageHomePage: https://github.com/Tencent/rapidjson
PackageOriginator: Milo Yip
PackageLicenseDeclared: MIT
FilesAnalyzed: false

PackageName: blake3
SPDXID: SPDXRef-blake3
PackageFileName: ./thirdparty/blake3
Expand All @@ -52,6 +44,5 @@ PackageLicenseDeclared: Apache-2.0

## Relationships
Relationship: SPDXRef-wasmedge CONTAINS SPDXRef-wagon
Relationship: SPDXRef-wasmedge CONTAINS SPDXRef-rapidjson
Relationship: SPDXRef-wasmedge CONTAINS SPDXRef-blake3
Relationship: SPDXRef-wasmedge CONTAINS SPDXRef-wasi-cpp-header
21 changes: 17 additions & 4 deletions test/spec/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,22 @@ FetchContent_Declare(
GIT_REPOSITORY https://github.com/second-state/WasmEdge-unittest
GIT_TAG wasm-dev-0.8.0
)
FetchContent_MakeAvailable(wasmedge_unit_test)

FetchContent_GetProperties(wasmedge_unit_test)
if (NOT wasmedge_unit_test_POPULATED)
FetchContent_Populate(wasmedge_unit_test)
endif ()
FetchContent_Declare(
rapidjson
GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
GIT_TAG 17aa824c928ea111e9b12a61e06d98335ce98f15
GIT_SHALLOW TRUE
)
set(RAPIDJSON_BUILD_DOC OFF CACHE BOOL "Build rapidjson documentation." FORCE)
set(RAPIDJSON_BUILD_EXAMPLES OFF CACHE BOOL "Build rapidjson examples." FORCE)
set(RAPIDJSON_BUILD_TESTS OFF CACHE BOOL "Build rapidjson perftests and unittests." FORCE)
set(RAPIDJSON_BUILD_CXX11 OFF CACHE BOOL "Build rapidjson with C++11" FORCE)
set(RAPIDJSON_BUILD_CXX17 ON CACHE BOOL "Build rapidjson with C++17" FORCE)
FetchContent_MakeAvailable(rapidjson)
add_library(rapidjson INTERFACE)
target_include_directories(rapidjson INTERFACE ${rapidjson_SOURCE_DIR}/include)

configure_files(
${wasmedge_unit_test_SOURCE_DIR}/core/
Expand All @@ -35,6 +46,8 @@ target_include_directories(wasmedgeTestSpec

target_link_libraries(wasmedgeTestSpec
PRIVATE
rapidjson
PUBLIC
std::filesystem
wasmedgeCommon
${GTEST_BOTH_LIBRARIES}
Expand Down
284 changes: 0 additions & 284 deletions thirdparty/rapidjson/allocators.h

This file was deleted.

Loading

0 comments on commit 74fd0ee

Please sign in to comment.