From 21f8410ba00f889962c5b848b744a656cdd5c70b Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Thu, 5 Jan 2023 15:31:07 +0100 Subject: [PATCH] updates scc --- CMakeLists.txt | 7 ++++--- scc | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b442017..2cd5bb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,9 +58,9 @@ endif() endif() 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 - OPTIONS fmt:header_only=True + OPTIONS fmt:header_only=True spdlog:header_only=True ) conan_install() @@ -69,7 +69,8 @@ find_package(lz4) # 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. find_package(Boost COMPONENTS program_options filesystem system thread REQUIRED) -find_package(fmt) +find_package(fmt REQUIRED) +find_package(spdlog REQUIRED) find_package(Catch2) include(SystemCPackage) diff --git a/scc b/scc index a4a0475..1781a6b 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit a4a047537e36934e3f1f16fd4c6a0fef24efb552 +Subproject commit 1781a6ba6ff63371443c7e83ddf2eac48fc2399e