Skip to content

Commit 504a7b0

Browse files
author
tmarcero
committed
Change the branches of the SystemC libraries and remove rapidjson.
- Rapidjson is now handle by the CCI library so we can remove it.
1 parent bd7fa97 commit 504a7b0

File tree

4 files changed

+11
-30
lines changed

4 files changed

+11
-30
lines changed

CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,8 @@ cpmaddpackage(
2424
NAME SystemCLanguage
2525
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
2626
GIT_SHALLOW True
27-
GIT_TAG master
27+
GIT_TAG main
2828
)
29-
if(SystemCLanguage_ADDED)
30-
set(SystemCLanguage_FOUND TRUE)
31-
endif()
3229

3330
cpmaddpackage(
3431
NAME initiator_id

report/CMakeLists.txt

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,14 @@ cpmaddpackage(
2424
NAME SystemCLanguage
2525
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
2626
GIT_SHALLOW True
27-
GIT_TAG master
27+
GIT_TAG main
2828
)
2929

30-
cpmaddpackage(
31-
NAME
32-
RapidJSON
33-
GIT_REPOSITORY
34-
https://github.com/Tencent/rapidjson
35-
GIT_TAG
36-
e0f68a435610e70ab5af44fc6a90523d69b210b3
37-
GIT_SHALLOW
38-
FALSE
39-
OPTIONS
40-
"RAPIDJSON_BUILD_TESTS OFF"
41-
"RAPIDJSON_BUILD_DOC OFF"
42-
"RAPIDJSON_BUILD_EXAMPLES OFF")
43-
44-
set(RapidJSON_DIR "${RapidJSON_BINARY_DIR}")
45-
4630
cpmaddpackage(
4731
NAME SystemCCCI
4832
GIT_REPOSITORY ${GITHUB}accellera-official/cci.git
4933
GIT_SHALLOW True
50-
GIT_TAG master
34+
GIT_TAG main
5135
)
5236

5337
set(WITH_FMT "true" CACHE STRING "Include FMT library")

tlm_extensions/initiator_id/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ include(${cpm-cmake_SOURCE_DIR}/cmake/CPM.cmake)
2121
cpmaddpackage("${GITHUB}TheLartians/[email protected]")
2222

2323
cpmaddpackage(
24-
NAME SystemCLanguage
25-
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
26-
GIT_SHALLOW True
27-
GIT_TAG master
24+
NAME SystemCLanguage
25+
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
26+
GIT_SHALLOW True
27+
GIT_TAG main
2828
)
2929

3030
add_library(${PROJECT_NAME} INTERFACE)

tlm_extensions/path_trace/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ include(${cpm-cmake_SOURCE_DIR}/cmake/CPM.cmake)
2121
cpmaddpackage("${GITHUB}TheLartians/[email protected]")
2222

2323
cpmaddpackage(
24-
NAME SystemCLanguage
25-
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
26-
GIT_SHALLOW True
27-
GIT_TAG master
24+
NAME SystemCLanguage
25+
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
26+
GIT_SHALLOW True
27+
GIT_TAG main
2828
)
2929

3030
add_library(${PROJECT_NAME} INTERFACE)

0 commit comments

Comments
 (0)