From a56d9197bc126dac4b19c48aab6b409dc47a0b20 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 9 Oct 2023 22:59:50 +0200 Subject: [PATCH] Adding Tramontana to meson build. --- cumulus/src/designflow/pnr.py | 4 +-- meson.build | 1 + tramontana/meson.build | 8 +++++ tramontana/src/PyTramontanaEngine.cpp | 2 +- tramontana/src/meson.build | 48 +++++++++++++++++++++++++++ 5 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 tramontana/meson.build create mode 100644 tramontana/src/meson.build diff --git a/cumulus/src/designflow/pnr.py b/cumulus/src/designflow/pnr.py index 7eb80b55..a02e201b 100644 --- a/cumulus/src/designflow/pnr.py +++ b/cumulus/src/designflow/pnr.py @@ -66,7 +66,7 @@ class PnR ( FlowTask ): print( 'PnR.doTask() run in interactive CGT mode.' ) PnR.textMode = False #from .. import Etesian, Anabatic, Katana, Bora, Tramontana, Tutorial, Viewer, Unicorn - from .. import Etesian, Anabatic, Katana, Bora, Viewer, Unicorn + from .. import Etesian, Anabatic, Katana, Bora, Tramontana, Viewer, Unicorn ShellEnv().export() if self.script and not callable(self.script): @@ -86,7 +86,7 @@ class PnR ( FlowTask ): unicorn.setApplicationName ( 'cgt') unicorn.registerTool ( Etesian.GraphicEtesianEngine.grab() ) unicorn.registerTool ( Katana.GraphicKatanaEngine.grab() ) - #unicorn.registerTool ( Tramontana.GraphicTramontanaEngine.grab() ) + unicorn.registerTool ( Tramontana.GraphicTramontanaEngine.grab() ) unicorn.registerTool ( Bora.GraphicBoraEngine.grab() ) #unicorn.registerTool ( Tutorial.GraphicTutorialEngine.grab() ) #unicorn.setAnonNetSelectable(False) diff --git a/meson.build b/meson.build index 2a4510bd..60a2009f 100644 --- a/meson.build +++ b/meson.build @@ -80,6 +80,7 @@ subdir('flute') subdir('etesian') subdir('anabatic') subdir('katana') +subdir('tramontana') subdir('equinox') subdir('solstice') subdir('oroshi') diff --git a/tramontana/meson.build b/tramontana/meson.build new file mode 100644 index 00000000..13062030 --- /dev/null +++ b/tramontana/meson.build @@ -0,0 +1,8 @@ +subdir('src') + +Tramontana = declare_dependency( + link_with: [tramontana], + include_directories: include_directories('src'), + dependencies: [Anabatic] +) + diff --git a/tramontana/src/PyTramontanaEngine.cpp b/tramontana/src/PyTramontanaEngine.cpp index 8f102374..11f5a8c8 100644 --- a/tramontana/src/PyTramontanaEngine.cpp +++ b/tramontana/src/PyTramontanaEngine.cpp @@ -18,7 +18,7 @@ #include "hurricane/isobar/PyNet.h" #include "hurricane/isobar/PyCell.h" -#include "hurricane/isobar/PyCellViewer.h" +#include "hurricane/viewer/PyCellViewer.h" #include "hurricane/viewer/ExceptionWidget.h" #include "hurricane/Cell.h" #include "crlcore/Utilities.h" diff --git a/tramontana/src/meson.build b/tramontana/src/meson.build new file mode 100644 index 00000000..b3d34549 --- /dev/null +++ b/tramontana/src/meson.build @@ -0,0 +1,48 @@ +tramontana_mocs = qt.compile_moc( + headers: [ + 'tramontana/GraphicTramontanaEngine.h', + 'tramontana/TabEquipotentials.h', + 'tramontana/EquipotentialsModel.h', + 'tramontana/EquipotentialsWidget.h', + ], + dependencies: [Anabatic], +) + +tramontana_py = files([ + 'PyTramontana.cpp', + 'PyTramontanaEngine.cpp', + 'PyGraphicTramontanaEngine.cpp', +]) + + +tramontana = shared_library( + 'tramontana', + + 'EquipotentialComponents.cpp', + 'Equipotential.cpp', + 'EquipotentialRelation.cpp', + 'EquipotentialsModel.cpp', + 'EquipotentialsWidget.cpp', + 'GraphicTramontanaEngine.cpp', + 'QueryTiles.cpp', + 'SweepLine.cpp', + 'TabEquipotentials.cpp', + 'Tile.cpp', + 'TramontanaEngine.cpp', + tramontana_mocs, + tramontana_py, + dependencies: [Anabatic], + install: true, +) + +py.extension_module( + 'Tramontana', + + tramontana_py, + + link_with: [tramontana], + dependencies: [py_mod_deps, Anabatic], + install: true, + subdir: 'coriolis' +) +