build on ubuntu20.04

This commit is contained in:
Stanislaw Kaushanski 2020-08-11 11:22:05 +02:00
parent 59545434d3
commit c50da08b18
4 changed files with 7 additions and 6 deletions

View File

@ -1,19 +1,20 @@
[requires] [requires]
gsl_microsoft/20180102@bincrafters/stable gsl_microsoft/20180102@bincrafters/stable
fmt/6.1.2 fmt/6.1.2
Seasocks/1.3.2@minres/stable seasocks/1.4.4@minres/stable
SystemC/2.3.3@minres/stable SystemC/2.3.3@minres/stable
SystemCVerification/2.0.1@minres/stable SystemCVerification/2.0.1@minres/stable
SystemC-CCI/1.0.0@minres/stable SystemC-CCI/1.0.0@minres/stable
#fbrdb/0.1.0@minres/testing #fbrdb/0.1.0@minres/testing
tcc/0.9.27@minres/stable tcc/0.9.27@minres/stable
boost/1.70.0@conan/stable boost/1.71.0@conan/stable
zlib/1.2.11
[generators] [generators]
cmake cmake
[options] [options]
Seasocks:shared=True seasocks:shared=True
boost:fPIC=True boost:fPIC=True
boost:shared=False boost:shared=False
boost:header_only=False boost:header_only=False

@ -1 +1 @@
Subproject commit fcc04d4d6914320285d05c7ff5c382f50aec7a82 Subproject commit d87dfff430e9ff3d394327bbf649a9f1bb05e396

View File

@ -31,7 +31,7 @@ set(LIB_SOURCES
add_library(platform ${LIB_SOURCES}) add_library(platform ${LIB_SOURCES})
target_include_directories(platform PUBLIC ../incl) 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 set_target_properties(platform PROPERTIES
VERSION ${PROJECT_VERSION} # ${VERSION} was defined in the main CMakeLists. VERSION ${PROJECT_VERSION} # ${VERSION} was defined in the main CMakeLists.
FRAMEWORK FALSE FRAMEWORK FALSE

View File

@ -62,7 +62,7 @@ inline void die() {
sc_comm_singleton::sc_comm_singleton(sc_core::sc_module_name nm) sc_comm_singleton::sc_comm_singleton(sc_core::sc_module_name nm)
: sc_core::sc_module(nm) : sc_core::sc_module(nm)
, m_serv(new Server(std::make_shared<PrintfLogger>(Logger::Level::WARNING))) , m_serv(new Server(std::make_shared<PrintfLogger>(Logger::Level::Warning)))
, needs_client(false) , needs_client(false)
, client_started(false) { , client_started(false) {
m_serv->addPageHandler(std::make_shared<DefaultPageHandler>(*this)); m_serv->addPageHandler(std::make_shared<DefaultPageHandler>(*this));