update scc and fix a few minor compile settings

This commit is contained in:
Eyck Jentzsch 2023-02-13 14:28:03 +01:00
parent 8ab8f8e478
commit eb2124c4d9
6 changed files with 12 additions and 3 deletions

View File

@ -29,10 +29,11 @@
</configuration> </configuration>
</storageModule> </storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
<storageModule buildDir="build/${ConfigName}" dirtyTs="1664639980112" moduleId="de.marw.cmake4eclipse.mbs.settings"> <storageModule buildDir="build/${ConfigName}" dirtyTs="1673562408113" moduleId="de.marw.cmake4eclipse.mbs.settings">
<options/> <options/>
<defs> <defs>
<def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/> <def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/>
<def name="BUILD_SCC_DOCUMENTATION" type="BOOL" val="OFF"/>
</defs> </defs>
</storageModule> </storageModule>
</cconfiguration> </cconfiguration>

2
.gitignore vendored
View File

@ -38,3 +38,5 @@
/Debug/ /Debug/
/*.txlog /*.txlog
/*.vcd /*.vcd
/.venv/
/.pydevproject

View File

@ -5,6 +5,11 @@
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name> <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers> <triggers>clean,full,incremental,</triggers>
@ -23,5 +28,6 @@
<nature>org.eclipse.cdt.core.ccnature</nature> <nature>org.eclipse.cdt.core.ccnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature> <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>org.python.pydev.pythonNature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

View File

@ -57,6 +57,7 @@ else()
endif() endif()
endif() endif()
set(CONAN_CMAKE_SILENT_OUTPUT ON)
conan_check() conan_check()
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 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

2
scc

@ -1 +1 @@
Subproject commit c8e5c0d8fb227c19bb0ba2b534790c7a48b294d4 Subproject commit dc05490f08078040deffe4424c0a559689053223

View File

@ -1,5 +1,4 @@
#define SC_INCLUDE_DYNAMIC_PROCESSES
#include "testbench.h" #include "testbench.h"
#include <factory.h> #include <factory.h>
#include <tlm/scc/tlm_gp_shared.h> #include <tlm/scc/tlm_gp_shared.h>