SystemC
/
PySysC-SC
5
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

develop #1

Merged
eyck merged 4 commits from develop into master 2021-03-14 12:24:50 +01:00
Conversation 0 Commits 4 Files Changed 14 +6 -9
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 38b309600a - Show all commits

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "sc-components"] [submodule "sc-components"]
path = sc-components path = scc
url = https://github.com/Minres/SystemC-Components.git url = https://github.com/Minres/SystemC-Components.git

9
CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.3) cmake_minimum_required(VERSION 3.3)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/sc-components/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/scc/cmake)
project(pysysc-sc) project(pysysc-sc)
@ -10,8 +10,7 @@ set(ENABLE_SHARED TRUE CACHE BOOL "Build shared libraries")
include(GNUInstallDirs) include(GNUInstallDirs)
include(Conan) include(Conan)
include(BuildType) include(BuildType)
include(clang-format)
#enable_testing()
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
@ -58,9 +57,7 @@ if(CCI_FOUND)
#message( FATAL_ERROR "SystemC CCI library not found." ) #message( FATAL_ERROR "SystemC CCI library not found." )
endif() endif()
include(sc-components/cmake/clang-format.cmake) add_subdirectory(scc)
add_subdirectory(sc-components)
add_subdirectory(components) add_subdirectory(components)
add_subdirectory(top) add_subdirectory(top)

2
router_example.py
View File

@ -13,7 +13,7 @@ res=pysysc.read_config_from_conan(os.path.join(myDir, 'conanfile.txt'), build_ty
pysysc.load_systemc() pysysc.load_systemc()
############################################################################### ###############################################################################
logging.debug("Loading SC-Components lib") logging.debug("Loading SC-Components lib")
pysysc.add_include_path(os.path.join(myDir, 'sc-components/incl')) pysysc.add_include_path(os.path.join(myDir, 'scc/incl'))
pysysc.add_library('scc.h', os.path.join(myDir, 'build/%s/lib/libscc.so'%build_type)) pysysc.add_library('scc.h', os.path.join(myDir, 'build/%s/lib/libscc.so'%build_type))
############################################################################### ###############################################################################
logging.debug("Loading Components lib") logging.debug("Loading Components lib")

2
router_example2.py
View File

@ -16,7 +16,7 @@ pysysc.read_config_from_conan(os.path.join(myDir, 'conanfile.txt'), build_type)
pysysc.load_systemc() pysysc.load_systemc()
############################################################################### ###############################################################################
logging.debug("Loading SC-Components lib") logging.debug("Loading SC-Components lib")
pysysc.add_include_path(os.path.join(myDir, 'sc-components/incl')) pysysc.add_include_path(os.path.join(myDir, 'scc/incl'))
pysysc.add_library('scc.h', os.path.join(myDir, 'build/%s/lib/libscc.so'%build_type)) pysysc.add_library('scc.h', os.path.join(myDir, 'build/%s/lib/libscc.so'%build_type))
############################################################################### ###############################################################################
logging.debug("Loading Components lib") logging.debug("Loading Components lib")

0
sc-components → scc
View File