rename submodule
This commit is contained in:
parent
55e003c22b
commit
38b309600a
|
@ -1,3 +1,3 @@
|
|||
[submodule "sc-components"]
|
||||
path = sc-components
|
||||
path = scc
|
||||
url = https://github.com/Minres/SystemC-Components.git
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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")
|
||||
|
|
Loading…
Reference in New Issue