Skip to content

Commit

Permalink
Change the branches of the SystemC libraries and remove rapidjson.
Browse files Browse the repository at this point in the history
- Rapidjson is now handle by the CCI library so we can remove it.
  • Loading branch information
tmarcero committed May 31, 2024
1 parent bd7fa97 commit 504a7b0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 30 deletions.
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,8 @@ cpmaddpackage(
NAME SystemCLanguage
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
GIT_SHALLOW True
GIT_TAG master
GIT_TAG main
)
if(SystemCLanguage_ADDED)
set(SystemCLanguage_FOUND TRUE)
endif()

cpmaddpackage(
NAME initiator_id
Expand Down
20 changes: 2 additions & 18 deletions report/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,14 @@ cpmaddpackage(
NAME SystemCLanguage
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
GIT_SHALLOW True
GIT_TAG master
GIT_TAG main
)

cpmaddpackage(
NAME
RapidJSON
GIT_REPOSITORY
https://github.com/Tencent/rapidjson
GIT_TAG
e0f68a435610e70ab5af44fc6a90523d69b210b3
GIT_SHALLOW
FALSE
OPTIONS
"RAPIDJSON_BUILD_TESTS OFF"
"RAPIDJSON_BUILD_DOC OFF"
"RAPIDJSON_BUILD_EXAMPLES OFF")

set(RapidJSON_DIR "${RapidJSON_BINARY_DIR}")

cpmaddpackage(
NAME SystemCCCI
GIT_REPOSITORY ${GITHUB}accellera-official/cci.git
GIT_SHALLOW True
GIT_TAG master
GIT_TAG main
)

set(WITH_FMT "true" CACHE STRING "Include FMT library")
Expand Down
8 changes: 4 additions & 4 deletions tlm_extensions/initiator_id/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ include(${cpm-cmake_SOURCE_DIR}/cmake/CPM.cmake)
cpmaddpackage("${GITHUB}TheLartians/[email protected]")

cpmaddpackage(
NAME SystemCLanguage
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
GIT_SHALLOW True
GIT_TAG master
NAME SystemCLanguage
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
GIT_SHALLOW True
GIT_TAG main
)

add_library(${PROJECT_NAME} INTERFACE)
Expand Down
8 changes: 4 additions & 4 deletions tlm_extensions/path_trace/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ include(${cpm-cmake_SOURCE_DIR}/cmake/CPM.cmake)
cpmaddpackage("${GITHUB}TheLartians/[email protected]")

cpmaddpackage(
NAME SystemCLanguage
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
GIT_SHALLOW True
GIT_TAG master
NAME SystemCLanguage
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
GIT_SHALLOW True
GIT_TAG main
)

add_library(${PROJECT_NAME} INTERFACE)
Expand Down

0 comments on commit 504a7b0

Please sign in to comment.