SystemC/SystemC-Components-Test
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

updates scc

Browse Source
This commit is contained in:
Eyck Jentzsch 2023-01-05 15:31:07 +01:00
parent 9296880f4b
commit 21f8410ba0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -58,9 +58,9 @@ endif()
endif() endif()
conan_check() conan_check()
conan_configure(REQUIRES fmt/6.1.2 boost/1.75.0 gsl-lite/0.37.0 systemc/2.3.3 systemc-cci/1.0.0 catch2/3.1.0 zlib/1.2.11 lz4/1.9.4 conan_configure(REQUIRES fmt/8.0.1 spdlog/1.9.2 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
GENERATORS cmake_find_package GENERATORS cmake_find_package
OPTIONS fmt:header_only=True OPTIONS fmt:header_only=True spdlog:header_only=True
) )
conan_install() conan_install()
@ -69,7 +69,8 @@ find_package(lz4)
# This line finds the boost lib and headers. # This line finds the boost lib and headers.
set(Boost_NO_BOOST_CMAKE ON) # Don't do a find_package in config mode before searching for a regular boost install. set(Boost_NO_BOOST_CMAKE ON) # Don't do a find_package in config mode before searching for a regular boost install.
find_package(Boost COMPONENTS program_options filesystem system thread REQUIRED) find_package(Boost COMPONENTS program_options filesystem system thread REQUIRED)
find_package(fmt) find_package(fmt REQUIRED)
find_package(spdlog REQUIRED)
find_package(Catch2) find_package(Catch2)
include(SystemCPackage) include(SystemCPackage)

2
scc

@ -1 +1 @@
Subproject commit a4a047537e36934e3f1f16fd4c6a0fef24efb552 Subproject commit 1781a6ba6ff63371443c7e83ddf2eac48fc2399e