From 38b309600a5773a796e16a27ee85a9b18e00de0c Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sun, 14 Mar 2021 09:29:38 +0100 Subject: [PATCH] rename submodule --- .gitmodules | 2 +- CMakeLists.txt | 9 +++------ router_example.py | 2 +- router_example2.py | 2 +- sc-components => scc | 0 5 files changed, 6 insertions(+), 9 deletions(-) rename sc-components => scc (100%) diff --git a/.gitmodules b/.gitmodules index fbca556..adb00af 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "sc-components"] - path = sc-components + path = scc url = https://github.com/Minres/SystemC-Components.git diff --git a/CMakeLists.txt b/CMakeLists.txt index b27b8d9..3ad52e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ 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) @@ -10,8 +10,7 @@ set(ENABLE_SHARED TRUE CACHE BOOL "Build shared libraries") include(GNUInstallDirs) include(Conan) include(BuildType) - -#enable_testing() +include(clang-format) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -58,9 +57,7 @@ if(CCI_FOUND) #message( FATAL_ERROR "SystemC CCI library not found." ) endif() -include(sc-components/cmake/clang-format.cmake) - -add_subdirectory(sc-components) +add_subdirectory(scc) add_subdirectory(components) add_subdirectory(top) diff --git a/router_example.py b/router_example.py index 05fa02f..1005e37 100644 --- a/router_example.py +++ b/router_example.py @@ -13,7 +13,7 @@ res=pysysc.read_config_from_conan(os.path.join(myDir, 'conanfile.txt'), build_ty pysysc.load_systemc() ############################################################################### 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)) ############################################################################### logging.debug("Loading Components lib") diff --git a/router_example2.py b/router_example2.py index b4927b8..22ede81 100644 --- a/router_example2.py +++ b/router_example2.py @@ -16,7 +16,7 @@ pysysc.read_config_from_conan(os.path.join(myDir, 'conanfile.txt'), build_type) pysysc.load_systemc() ############################################################################### 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)) ############################################################################### logging.debug("Loading Components lib") diff --git a/sc-components b/scc similarity index 100% rename from sc-components rename to scc