Skip to content

Commit

Permalink
Check if a custom version of SystemC is used and update CMake tests
Browse files Browse the repository at this point in the history
  • Loading branch information
tmarcero committed Apr 9, 2024
1 parent bd7fa97 commit 8ea6963
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 26 deletions.
15 changes: 7 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@ 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
)
if(SystemCLanguage_ADDED)
set(SystemCLanguage_FOUND TRUE)
if (NOT SystemCLanguageLocal_FOUND)
cpmaddpackage(
NAME SystemCLanguage
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
GIT_SHALLOW True
GIT_TAG main
)
endif()

cpmaddpackage(
Expand Down
15 changes: 9 additions & 6 deletions report/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ 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
)
if (NOT SystemCLanguageLocal_FOUND)
cpmaddpackage(
NAME SystemCLanguage
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
GIT_SHALLOW True
GIT_TAG main
)
endif()

cpmaddpackage(
NAME
Expand All @@ -42,6 +44,7 @@ cpmaddpackage(
"RAPIDJSON_BUILD_EXAMPLES OFF")

set(RapidJSON_DIR "${RapidJSON_BINARY_DIR}")
set(RAPIDJSON_INCLUDE_DIRS "${RapidJSON_SOURCE_DIR}/include")

cpmaddpackage(
NAME SystemCCCI
Expand Down
14 changes: 8 additions & 6 deletions tlm_extensions/initiator_id/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ 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
)
if (NOT SystemCLanguageLocal_FOUND)
cpmaddpackage(
NAME SystemCLanguage
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
GIT_SHALLOW True
GIT_TAG main
)
endif()

add_library(${PROJECT_NAME} INTERFACE)

Expand Down
14 changes: 8 additions & 6 deletions tlm_extensions/path_trace/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ 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
)
if (NOT SystemCLanguageLocal_FOUND)
cpmaddpackage(
NAME SystemCLanguage
GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git
GIT_SHALLOW True
GIT_TAG main
)
endif()

add_library(${PROJECT_NAME} INTERFACE)

Expand Down

0 comments on commit 8ea6963

Please sign in to comment.