updates boost, Rocky8 setup and scc

This commit is contained in:
Eyck Jentzsch 2024-06-04 10:09:24 +02:00
parent 892554f1f3
commit 1e7f9cfc22
3 changed files with 4 additions and 2 deletions

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

View File

@ -59,7 +59,7 @@ find_package(ClangFormat)
set(CONAN_CMAKE_SILENT_OUTPUT ON)
conan_check()
conan_configure(REQUIRES jsoncpp/1.9.5 yaml-cpp/0.6.3 spdlog/1.9.2 fmt/8.0.1 boost/1.75.0 gsl-lite/0.37.0 systemc/2.3.3 catch2/3.1.0 zlib/1.2.11 lz4/1.9.4
conan_configure(REQUIRES jsoncpp/1.9.5 yaml-cpp/0.6.3 spdlog/1.9.2 fmt/8.0.1 boost/1.85.0 gsl-lite/0.37.0 systemc/2.3.4 catch2/3.1.0 zlib/1.2.11 lz4/1.9.4
GENERATORS cmake_find_package
OPTIONS fmt:header_only=True spdlog:header_only=True
)

2
scc

@ -1 +1 @@
Subproject commit 959f32940b209787e2402ff8f43f8d6b0ef8a0d3
Subproject commit 93d56f8367550b62cca6b5055e7250741a96cc71