riscv
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Coloquinte2 to the build

This commit is contained in:
Gabriel Gouvine 2023-05-16 09:20:52 +02:00
parent 21eedbcc2b
commit a9f55021fd
7 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "coloquinte2"]
path = coloquinte2
url = git@github.com:Coloquinte/PlaceRoute.git

2
bootstrap/Makefile.package
View File

@ -4,7 +4,7 @@
pythonSiteLocator = "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1)" pythonSiteLocator = "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1)"
tools = bootstrap vlsisapd hurricane crlcore coloquinte etesian knik \ tools = bootstrap vlsisapd hurricane crlcore coloquinte coloquinte2 etesian knik \
katabatic kite equinox solstice cumulus stratus1 unicorn documentation katabatic kite equinox solstice cumulus stratus1 unicorn documentation
prefix = /usr prefix = /usr
rootPrefix = $(subst /usr,,$(prefix)) rootPrefix = $(subst /usr,,$(prefix))

1
bootstrap/build.conf
View File

@ -15,6 +15,7 @@ projects = [
, 'tools' : [ "bootstrap" , 'tools' : [ "bootstrap"
, "lefdef" , "lefdef"
, "coloquinte" , "coloquinte"
, "coloquinte2"
, "hurricane" , "hurricane"
, "crlcore" , "crlcore"
, "flute" , "flute"

4
bootstrap/cmake_modules/FindBootstrap.cmake
View File

@ -84,10 +84,10 @@
set(DEBUG_FLAGS "-g") set(DEBUG_FLAGS "-g")
if(CYGWIN) if(CYGWIN)
set(ADDITIONAL_FLAGS "-D_GLIBCXX_USE_C99") set(ADDITIONAL_FLAGS "-D_GLIBCXX_USE_C99")
set(CXX_STANDARD "gnu++11") set(CXX_STANDARD "gnu++17")
else() else()
set(ADDITIONAL_FLAGS "-Wl,--no-undefined") set(ADDITIONAL_FLAGS "-Wl,--no-undefined")
set(CXX_STANDARD "c++11") set(CXX_STANDARD "c++17")
endif() endif()
#set(CMAKE_C_FLAGS_DEBUG " -Wall -fsanitize=address ${ADDITIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options." FORCE) #set(CMAKE_C_FLAGS_DEBUG " -Wall -fsanitize=address ${ADDITIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options." FORCE)
set(CMAKE_C_FLAGS_DEBUG " -Wall ${ADDITIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options." FORCE) set(CMAKE_C_FLAGS_DEBUG " -Wall ${ADDITIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options." FORCE)

1
bootstrap/coriolis2.spec.in
View File

@ -157,6 +157,7 @@ Development files for the Coriolis 2 package.
%dir %{coriolisTop}/include/vlsisapd/dtr %dir %{coriolisTop}/include/vlsisapd/dtr
%dir %{coriolisTop}/include/vlsisapd/openChams %dir %{coriolisTop}/include/vlsisapd/openChams
%dir %{coriolisTop}/include/coriolis2/coloquinte %dir %{coriolisTop}/include/coriolis2/coloquinte
%dir %{coriolisTop}/include/coriolis2/coloquinte2
%dir %{coriolisTop}/include/coriolis2/hurricane %dir %{coriolisTop}/include/coriolis2/hurricane
%dir %{coriolisTop}/include/coriolis2/hurricane/viewer %dir %{coriolisTop}/include/coriolis2/hurricane/viewer
%dir %{coriolisTop}/include/coriolis2/hurricane/isobar %dir %{coriolisTop}/include/coriolis2/hurricane/isobar

1
builder.py
View File

@ -117,6 +117,7 @@ class ExtensionBuilder(build_ext):
def build(setup_kwargs: Dict[str, Any]) -> None: def build(setup_kwargs: Dict[str, Any]) -> None:
cmake_modules = [ cmake_modules = [
CMakeExtension("coloquinte", sourcedir="coloquinte"), CMakeExtension("coloquinte", sourcedir="coloquinte"),
CMakeExtension("coloquinte2", sourcedir="coloquinte2"),
CMakeExtension("Hurricane", sourcedir="hurricane"), CMakeExtension("Hurricane", sourcedir="hurricane"),
CMakeExtension("crlcore", sourcedir="crlcore"), CMakeExtension("crlcore", sourcedir="crlcore"),
CMakeExtension("flute", sourcedir="flute"), CMakeExtension("flute", sourcedir="flute"),

1
coloquinte2 Submodule

@ -0,0 +1 @@
Subproject commit 068689b3eea8d2a5b47ada054fba828209897515