Fix RapidJSON issue

Signed-off-by: Mark Burton <[email protected]>
accellera-official · Mar 21, 2024 · 81b30b7 · 81b30b7
1 parent 5ec6ee5
commit 81b30b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,29 +35,6 @@ else ()
   )
 endif()
 
-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
-)
-
 cpmaddpackage(
   NAME initiator_id
   SOURCE_DIR ${PROJECT_SOURCE_DIR}/tlm_extensions/initiator_id

diff --git a/report/CMakeLists.txt b/report/CMakeLists.txt
@@ -48,13 +48,15 @@ cpmaddpackage(
   "RAPIDJSON_BUILD_DOC OFF"
   "RAPIDJSON_BUILD_EXAMPLES OFF")
 
-set(RapidJSON_DIR "${RapidJSON_BINARY_DIR}")
+  # nasty hack till dady takes the t-bird away.
+  set(RAPIDJSON_INCLUDE_DIRS "${RapidJSON_SOURCE_DIR}/include")
 
 cpmaddpackage(
   NAME SystemCCCI
   GIT_REPOSITORY  ${GITHUB}accellera-official/cci.git
   GIT_SHALLOW True
-  GIT_TAG master
+  GIT_TAG main
+  OPTIONS "SYSTEMCCCI_BUILD_TESTS OFF"
 )
 
 set(WITH_FMT "true" CACHE STRING "Include FMT library")