From 2825646edcdbf424e5d068b2b602816f9a221b97 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Fri, 21 Jun 2024 09:28:49 +0200 Subject: [PATCH 1/6] updates scc --- scc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scc b/scc index 4dcc549..1925a6e 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit 4dcc5497c587afb0c77423aa532a29082bf03969 +Subproject commit 1925a6e69d0efea9da739a0b32bd623baaf54988 From bfea2374b4c7606c8831b2fe63caa1e54df7e6ad Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Fri, 21 Jun 2024 10:46:33 +0200 Subject: [PATCH 2/6] updates dbt-rise-tgc to pull template updates --- dbt-rise-tgc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbt-rise-tgc b/dbt-rise-tgc index 3fd51cc..2fb2836 160000 --- a/dbt-rise-tgc +++ b/dbt-rise-tgc @@ -1 +1 @@ -Subproject commit 3fd51cc68c4547cb1e89d56a2010ff3af0ff5e97 +Subproject commit 2fb28364c53ab65af9620c43f93d58a229d42909 From c19e7c6a46f09c6ea97fb5a7f3c0373f8738558a Mon Sep 17 00:00:00 2001 From: stas Date: Thu, 4 Jul 2024 10:48:33 +0200 Subject: [PATCH 3/6] update submodules to add FCOUNT --- dbt-rise-core | 2 +- dbt-rise-tgc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbt-rise-core b/dbt-rise-core index 6a5bb0f..b725ff3 160000 --- a/dbt-rise-core +++ b/dbt-rise-core @@ -1 +1 @@ -Subproject commit 6a5bb0fe5e067c23678876716777f8e65c60636a +Subproject commit b725ff307be15ae274b5b4e97bcb73856212b1b4 diff --git a/dbt-rise-tgc b/dbt-rise-tgc index 2fb2836..d4ec131 160000 --- a/dbt-rise-tgc +++ b/dbt-rise-tgc @@ -1 +1 @@ -Subproject commit 2fb28364c53ab65af9620c43f93d58a229d42909 +Subproject commit d4ec131fa719e837e1b2b95d2ef23890cba0be12 From 6dbce5cb23c1fb740f7cff0952cd150165e97a0c Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Fri, 5 Jul 2024 05:56:43 +0200 Subject: [PATCH 4/6] updates submodules to get extended finishing conditions --- dbt-rise-core | 2 +- dbt-rise-tgc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbt-rise-core b/dbt-rise-core index b725ff3..5c453ee 160000 --- a/dbt-rise-core +++ b/dbt-rise-core @@ -1 +1 @@ -Subproject commit b725ff307be15ae274b5b4e97bcb73856212b1b4 +Subproject commit 5c453eee2a093a277c77f4d840535a9e63e34023 diff --git a/dbt-rise-tgc b/dbt-rise-tgc index d4ec131..346b177 160000 --- a/dbt-rise-tgc +++ b/dbt-rise-tgc @@ -1 +1 @@ -Subproject commit d4ec131fa719e837e1b2b95d2ef23890cba0be12 +Subproject commit 346b177a87b8bfa9f3e895e63910f9c7cf7a1561 From 97b52b9e054a69bde80efc5a43a6f147a04265e6 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Fri, 5 Jul 2024 07:42:26 +0200 Subject: [PATCH 5/6] updates submodules --- .envrc | 2 ++ dbt-rise-core | 2 +- scc | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.envrc b/.envrc index de09571..488f293 100644 --- a/.envrc +++ b/.envrc @@ -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 diff --git a/dbt-rise-core b/dbt-rise-core index 5c453ee..b725ff3 160000 --- a/dbt-rise-core +++ b/dbt-rise-core @@ -1 +1 @@ -Subproject commit 5c453eee2a093a277c77f4d840535a9e63e34023 +Subproject commit b725ff307be15ae274b5b4e97bcb73856212b1b4 diff --git a/scc b/scc index 1925a6e..59d07fb 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit 1925a6e69d0efea9da739a0b32bd623baaf54988 +Subproject commit 59d07fbc6678f5676dc508925ed1982007e350f1 From d488581e3a914ef9cb16c79fcb74a0f4889421cf Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Fri, 5 Jul 2024 08:06:56 +0200 Subject: [PATCH 6/6] fixes build setup --- .gitignore | 1 + CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 58016a4..614430a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /dbt-rise-plugins /.direnv /TGC_C_XRB/ +/.envrc.eyck diff --git a/CMakeLists.txt b/CMakeLists.txt index fcf0afd..4d7626a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)