diff --git a/conanfile.txt b/conanfile.txt index 92ce149..c21f767 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,19 +1,20 @@ [requires] gsl_microsoft/20180102@bincrafters/stable fmt/6.1.2 - Seasocks/1.3.2@minres/stable + seasocks/1.4.4@minres/stable SystemC/2.3.3@minres/stable SystemCVerification/2.0.1@minres/stable SystemC-CCI/1.0.0@minres/stable #fbrdb/0.1.0@minres/testing tcc/0.9.27@minres/stable - boost/1.70.0@conan/stable + boost/1.71.0@conan/stable + zlib/1.2.11 [generators] cmake [options] - Seasocks:shared=True + seasocks:shared=True boost:fPIC=True boost:shared=False boost:header_only=False diff --git a/dbt-core b/dbt-core index fcc04d4..d87dfff 160000 --- a/dbt-core +++ b/dbt-core @@ -1 +1 @@ -Subproject commit fcc04d4d6914320285d05c7ff5c382f50aec7a82 +Subproject commit d87dfff430e9ff3d394327bbf649a9f1bb05e396 diff --git a/platform/src/CMakeLists.txt b/platform/src/CMakeLists.txt index 18e0292..b9cba48 100644 --- a/platform/src/CMakeLists.txt +++ b/platform/src/CMakeLists.txt @@ -31,7 +31,7 @@ set(LIB_SOURCES add_library(platform ${LIB_SOURCES}) target_include_directories(platform PUBLIC ../incl) -target_link_libraries(platform PUBLIC riscv_sc CONAN_PKG::Seasocks external) +target_link_libraries(platform PUBLIC riscv_sc CONAN_PKG::seasocks external) set_target_properties(platform PROPERTIES VERSION ${PROJECT_VERSION} # ${VERSION} was defined in the main CMakeLists. FRAMEWORK FALSE diff --git a/platform/src/sysc/sc_comm_singleton.cpp b/platform/src/sysc/sc_comm_singleton.cpp index 1832126..3969d69 100644 --- a/platform/src/sysc/sc_comm_singleton.cpp +++ b/platform/src/sysc/sc_comm_singleton.cpp @@ -62,7 +62,7 @@ inline void die() { sc_comm_singleton::sc_comm_singleton(sc_core::sc_module_name nm) : sc_core::sc_module(nm) -, m_serv(new Server(std::make_shared(Logger::Level::WARNING))) +, m_serv(new Server(std::make_shared(Logger::Level::Warning))) , needs_client(false) , client_started(false) { m_serv->addPageHandler(std::make_shared(*this));