TGFS
/
TGC-ISS
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into main

This commit is contained in:
Eyck Jentzsch 2024-07-05 08:07:22 +02:00
parent c1e0379f7b d488581e3a
commit d7d072bb0b
6 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.envrc
View File

@ -3,6 +3,8 @@ distro=`/bin/lsb_release -i -s`
if [ $distro == "CentOS" ]; then
. /opt/rh/devtoolset-8/enable
. /opt/rh/rh-python38/enable
elif [ $distro == "Rocky" ]; then
. /opt/rh/gcc-toolset-11/enable
fi
layout python3
[ -f .envrc.$USER ] && . .envrc.$USER

1
.gitignore vendored
View File

@ -22,3 +22,4 @@
/dbt-rise-plugins
/.direnv
/TGC_C_XRB/
/.envrc.eyck

2
CMakeLists.txt
View File

@ -225,13 +225,13 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
endif()
endif()
add_subdirectory(dbt-rise-core)
if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS" AND NOT USE_CWR_SYSTEMC)
set(SCC_CMAKE_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/scc)
add_subdirectory(scc/src/common)
else()
add_subdirectory(scc)
endif()
add_subdirectory(dbt-rise-core)
add_subdirectory(dbt-rise-tgc)
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
add_subdirectory(dbt-rise-plugins)

2
dbt-rise-core

@ -1 +1 @@
Subproject commit 6a5bb0fe5e067c23678876716777f8e65c60636a
Subproject commit b725ff307be15ae274b5b4e97bcb73856212b1b4

2
dbt-rise-tgc

@ -1 +1 @@
Subproject commit 3fd51cc68c4547cb1e89d56a2010ff3af0ff5e97
Subproject commit 346b177a87b8bfa9f3e895e63910f9c7cf7a1561

2
scc

@ -1 +1 @@
Subproject commit 4dcc5497c587afb0c77423aa532a29082bf03969
Subproject commit 59d07fbc6678f5676dc508925ed1982007e350f1