From 4cb8ca3f611d9b3356572c2b7f2253ede5bdfc4e Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sat, 30 Sep 2023 22:11:48 +0200
Subject: [PATCH] updates project configuration

---
 .cproject        | 6 +++---
 .envrc           | 9 +++++++++
 CMakeLists.txt   | 2 +-
 Modulefile       | 1 +
 dbt-rise-tgc     | 2 +-
 requirements.txt | 1 +
 scc              | 2 +-
 7 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 .envrc
 create mode 100644 requirements.txt

diff --git a/.cproject b/.cproject
index 34846f4..996ccbc 100644
--- a/.cproject
+++ b/.cproject
@@ -16,7 +16,7 @@
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1336041151.1615713914" name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.base.1297474963" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.1141103737" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
-							<builder buildPath="/TGC-ISS/_build/Debug" id="cmake4eclipse.mbs.builder.1823257054" keepEnvironmentInBuildfile="false" name="CMake Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="cmake4eclipse.mbs.builder"/>
+							<builder buildPath="/TGC-ISS/_build/Debug" id="cmake4eclipse.mbs.builder.1823257054" keepEnvironmentInBuildfile="false" name="CMake Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cmake4eclipse.mbs.builder"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.740869785" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1934077203" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1599133325" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
@@ -48,13 +48,13 @@
 					<def name="CMAKE_BUILD_TYPE" type="STRING" val="${ConfigName}"/>
 				</defs>
 			</storageModule>
-			<storageModule buildDir="build/${ConfigName}" dirtyTs="1692539890623" moduleId="de.marw.cmake4eclipse.mbs.settings">
+			<storageModule buildDir="build/${ConfigName}" dirtyTs="1696098329268" moduleId="de.marw.cmake4eclipse.mbs.settings">
 				<options/>
 				<defs>
 					<def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/>
 					<def name="BUILD_SHARED_LIBS" type="BOOL" val="ON"/>
 					<def name="CMAKE_INSTALL_PREFIX" type="FILEPATH" val="${ProjDirPath}/install"/>
-					<def name="WITH_LLVM" type="BOOL" val="ON"/>
+					<def name="WITH_LLVM" type="BOOL" val="OFF"/>
 					<def name="FW_BUILD" type="BOOL" val="ON"/>
 				</defs>
 			</storageModule>
diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..1698db7
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,9 @@
+module load ./Modulefile
+distro=`/bin/lsb_release -i -s`
+if [ $distro == "CentOS" ]; then 
+    . /opt/rh/devtoolset-8/enable
+    . /opt/rh/llvm-toolset-7/enable
+    . /opt/rh/rh-python38/enable
+fi
+layout python3
+[ -f .envrc.$USER ] && . .envrc.$USER
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e23e903..92d76c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,7 +140,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGFS-ISS")
 	find_package(spdlog)
 	find_package(lz4)
 	find_package(gsl-lite)
-	
+	find_package(yaml-cpp)
 	set(Boost_NO_BOOST_CMAKE ON) #  Don't do a find_package in config mode before searching for a regular boost install.
 	set(BOOST_ROOT ${CONAN_BOOST_ROOT})
 	find_package(Threads)
diff --git a/Modulefile b/Modulefile
index 6a191ef..ac18f92 100644
--- a/Modulefile
+++ b/Modulefile
@@ -13,6 +13,7 @@ if { $distro == "CentOS" && ![info exists ::env(PROJECT)] && ![info exists ::env
     puts stderr     "Don't forget to execute 'scl enable devtoolset-7 bash'"
 }
 
+#module load tools/utilities
 module load tools/cmake
 #module load tools/gcc-riscv64/9.2.0
 module load tools/gcc-riscv32-unknown-elf/11
diff --git a/dbt-rise-tgc b/dbt-rise-tgc
index b7f0237..b97853f 160000
--- a/dbt-rise-tgc
+++ b/dbt-rise-tgc
@@ -1 +1 @@
-Subproject commit b7f023756e0f6c0bb3600ffe59dae96026ad1bbe
+Subproject commit b97853ff5a681acfb6138f4e46c5da881ec64f3b
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..5cbe7e7
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+conan==1.59
diff --git a/scc b/scc
index fa29fc1..a21316a 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit fa29fc13c9a46bad9eeed2e54b536d5d9bfb3607
+Subproject commit a21316a97fff4953a3c08d32f6b97cf6d11d441e