diff --git a/.cproject b/.cproject index f3227a1..d6bd789 100644 --- a/.cproject +++ b/.cproject @@ -29,10 +29,11 @@ - + + diff --git a/.gitignore b/.gitignore index bbfda94..e6d0854 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ /Debug/ /*.txlog /*.vcd +/.venv/ +/.pydevproject diff --git a/.project b/.project index 63b8ead..e7ad514 100644 --- a/.project +++ b/.project @@ -5,6 +5,11 @@ + + org.python.pydev.PyDevBuilder + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder clean,full,incremental, @@ -23,5 +28,6 @@ org.eclipse.cdt.core.ccnature org.eclipse.cdt.managedbuilder.core.managedBuildNature org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + org.python.pydev.pythonNature diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cd5bb0..d295322 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,7 @@ else() endif() endif() +set(CONAN_CMAKE_SILENT_OUTPUT ON) 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 GENERATORS cmake_find_package diff --git a/scc b/scc index c8e5c0d..dc05490 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit c8e5c0d8fb227c19bb0ba2b534790c7a48b294d4 +Subproject commit dc05490f08078040deffe4424c0a559689053223 diff --git a/tests/axi4_pin_level/narrow_burst_test.cpp b/tests/axi4_pin_level/narrow_burst_test.cpp index aa220e0..8df9616 100644 --- a/tests/axi4_pin_level/narrow_burst_test.cpp +++ b/tests/axi4_pin_level/narrow_burst_test.cpp @@ -1,5 +1,4 @@ -#define SC_INCLUDE_DYNAMIC_PROCESSES #include "testbench.h" #include #include