riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

* All Tools: 

- Change: Switch from "goodies" to "bootstrap".
This commit is contained in:
Jean-Paul Chaput 2010-07-14 19:39:36 +00:00
parent d625685430
commit 7231703f4f
8 changed files with 50 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hurricane/CMakeLists.txt
View File

@ -4,10 +4,6 @@ OPTION(BUILD_DOC "Build the documentation (doxygen)" OFF)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0) CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
#IF(COMMAND CMAKE_POLICY)
# CMAKE_POLICY(SET CMP0003 NEW)
#ENDIF(COMMAND CMAKE_POLICY)
MACRO(SETUP_PROJECT_PATHS project) MACRO(SETUP_PROJECT_PATHS project)
IF( NOT("$ENV{${project}_TOP}" STREQUAL "") ) IF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}") MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}")
@ -24,18 +20,17 @@ MACRO(SETUP_PROJECT_PATHS project)
LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH) LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH)
ENDMACRO(SETUP_PROJECT_PATHS project) ENDMACRO(SETUP_PROJECT_PATHS project)
SETUP_PROJECT_PATHS(GOODIES) SETUP_PROJECT_PATHS(BOOTSTRAP)
SETUP_PROJECT_PATHS(VLSISAPD) SETUP_PROJECT_PATHS(VLSISAPD)
LIST(INSERT CMAKE_MODULE_PATH 0 "${HURRICANE_SOURCE_DIR}/cmake_modules/") LIST(INSERT CMAKE_MODULE_PATH 0 "${HURRICANE_SOURCE_DIR}/cmake_modules/")
find_package(Goodies REQUIRED) find_package(Bootstrap REQUIRED)
set_cmake_policies()
set_lib_link_mode() set_lib_link_mode()
setup_boost(regex) setup_boost(regex)
SET(QT_USE_QTXML "true") SET(QT_USE_QTXML "true")
FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project
FIND_PACKAGE(BISON REQUIRED) FIND_PACKAGE(BISON REQUIRED)
FIND_PACKAGE(FLEX REQUIRED) FIND_PACKAGE(FLEX REQUIRED)

36
hurricane/cmake_modules/FindHURRICANE.cmake
View File

@ -33,22 +33,6 @@ IF(UNIX)
DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
) )
FIND_PATH(HURRICANE_VIEWER_INCLUDE_PATH
NAMES hurricane/viewer/CellWidget.h
PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES include/coriolis2 include
# Help the user find it if we cannot.
DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
)
FIND_LIBRARY(HURRICANE_VIEWER_LIBRARY_PATH
NAMES viewer
PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX}
# Help the user find it if we cannot.
DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
)
FIND_PATH(HURRICANE_PYTHON_INCLUDE_PATH FIND_PATH(HURRICANE_PYTHON_INCLUDE_PATH
NAMES hurricane/isobar/PyCell.h NAMES hurricane/isobar/PyCell.h
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
@ -65,9 +49,25 @@ IF(UNIX)
DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
) )
SET_LIBRARIES_PATH(HURRICANE HURRICANE) FIND_PATH(HURRICANE_VIEWER_INCLUDE_PATH
SET_LIBRARIES_PATH(HURRICANE_GRAPHICAL HURRICANE_VIEWER) NAMES hurricane/viewer/CellWidget.h
PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES include/coriolis2 include
# Help the user find it if we cannot.
DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
)
FIND_LIBRARY(HURRICANE_VIEWER_LIBRARY_PATH
NAMES viewer
PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX}
# Help the user find it if we cannot.
DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
)
SET_LIBRARIES_PATH(HURRICANE HURRICANE)
SET_LIBRARIES_PATH(HURRICANE_PYTHON HURRICANE_PYTHON) SET_LIBRARIES_PATH(HURRICANE_PYTHON HURRICANE_PYTHON)
SET_LIBRARIES_PATH(HURRICANE_GRAPHICAL HURRICANE_VIEWER)
HURRICANE_CHECK_LIBRARIES(HURRICANE ) HURRICANE_CHECK_LIBRARIES(HURRICANE )
HURRICANE_CHECK_LIBRARIES(HURRICANE_GRAPHICAL ${HURRICANE_FIND_REQUIRED}) HURRICANE_CHECK_LIBRARIES(HURRICANE_GRAPHICAL ${HURRICANE_FIND_REQUIRED})

6
hurricane/src/isobar/CMakeLists.txt
View File

@ -11,7 +11,6 @@
PyBox.cpp PyBox.cpp
PyCell.cpp PyCell.cpp
PyCellCollection.cpp PyCellCollection.cpp
PyCellViewer.cpp
PyComponent.cpp PyComponent.cpp
PyComponentCollection.cpp PyComponentCollection.cpp
PyContact.cpp PyContact.cpp
@ -51,7 +50,6 @@
hurricane/isobar/PyBox.h hurricane/isobar/PyBox.h
hurricane/isobar/PyCell.h hurricane/isobar/PyCell.h
hurricane/isobar/PyCellCollection.h hurricane/isobar/PyCellCollection.h
hurricane/isobar/PyCellViewer.h
hurricane/isobar/PyComponent.h hurricane/isobar/PyComponent.h
hurricane/isobar/PyComponentCollection.h hurricane/isobar/PyComponentCollection.h
hurricane/isobar/PyContact.h hurricane/isobar/PyContact.h
@ -89,15 +87,13 @@
# source2 & include2 for module that are *not* Python wrappers but true # source2 & include2 for module that are *not* Python wrappers but true
# Hurricane modules. # Hurricane modules.
set ( sources2 Script.cpp ) set ( sources2 Script.cpp )
set ( includes2 hurricane/isobar/Script.h) set ( includes2 hurricane/isobar/Script.h )
install ( FILES ${includes} install ( FILES ${includes}
${includes2} DESTINATION include/coriolis2/hurricane/isobar ) ${includes2} DESTINATION include/coriolis2/hurricane/isobar )
add_library ( isobar ${sources} ${sources2} ) add_library ( isobar ${sources} ${sources2} )
target_link_libraries ( isobar viewer )
add_library ( Hurricane MODULE ${sources} ) add_library ( Hurricane MODULE ${sources} )
target_link_libraries ( Hurricane viewer )
set_target_properties ( Hurricane PROPERTIES set_target_properties ( Hurricane PROPERTIES
COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
PREFIX "" PREFIX ""

4
hurricane/src/isobar/PyHurricane.cpp
View File

@ -64,7 +64,6 @@
#include "hurricane/isobar/PyEntity.h" #include "hurricane/isobar/PyEntity.h"
#include "hurricane/isobar/PyCell.h" #include "hurricane/isobar/PyCell.h"
#include "hurricane/isobar/PyCellCollection.h" #include "hurricane/isobar/PyCellCollection.h"
#include "hurricane/isobar/PyCellViewer.h"
#include "hurricane/isobar/PyLayer.h" #include "hurricane/isobar/PyLayer.h"
#include "hurricane/isobar/PyPin.h" #include "hurricane/isobar/PyPin.h"
#include "hurricane/isobar/PyPinCollection.h" #include "hurricane/isobar/PyPinCollection.h"
@ -551,7 +550,6 @@ extern "C" {
PyContact_LinkPyType (); PyContact_LinkPyType ();
PyPin_LinkPyType (); PyPin_LinkPyType ();
PyPlug_LinkPyType (); PyPlug_LinkPyType ();
PyCellViewer_LinkPyType ();
PyBreakpoint_LinkPyType (); PyBreakpoint_LinkPyType ();
PYTYPE_READY ( UpdateSession ) PYTYPE_READY ( UpdateSession )
@ -584,7 +582,6 @@ extern "C" {
PYTYPE_READY ( ReferenceCollection ) PYTYPE_READY ( ReferenceCollection )
PYTYPE_READY ( ReferenceCollectionLocator ) PYTYPE_READY ( ReferenceCollectionLocator )
PYTYPE_READY ( HyperNet ) PYTYPE_READY ( HyperNet )
PYTYPE_READY ( CellViewer )
PYTYPE_READY ( NetExternalComponents ) PYTYPE_READY ( NetExternalComponents )
PYTYPE_READY ( Breakpoint ) PYTYPE_READY ( Breakpoint )
@ -607,7 +604,6 @@ extern "C" {
__cs.addType ( "ent" , &PyTypeEntity , "<Entity>" , false ); __cs.addType ( "ent" , &PyTypeEntity , "<Entity>" , false );
__cs.addType ( "cell" , &PyTypeCell , "<Cell>" , false, "ent" ); __cs.addType ( "cell" , &PyTypeCell , "<Cell>" , false, "ent" );
__cs.addType ( "cellCol" , &PyTypeCellCollection , "<CellCollection>" , false ); __cs.addType ( "cellCol" , &PyTypeCellCollection , "<CellCollection>" , false );
__cs.addType ( "cellView" , &PyTypeCellViewer , "<CellViewer>" , false, "view" );
__cs.addType ( "comp" , &PyTypeComponent , "<Component>" , false, "ent" ); __cs.addType ( "comp" , &PyTypeComponent , "<Component>" , false, "ent" );
__cs.addType ( "compCol" , &PyTypeComponentCollection , "<ComponentCollection>" , false ); __cs.addType ( "compCol" , &PyTypeComponentCollection , "<ComponentCollection>" , false );
__cs.addType ( "contact" , &PyTypeContact , "<Contact>" , false, "comp" ); __cs.addType ( "contact" , &PyTypeContact , "<Contact>" , false, "comp" );

2
hurricane/src/isobar/Script.cpp
View File

@ -41,8 +41,8 @@
#include <sstream> #include <sstream>
#include "hurricane/Error.h" #include "hurricane/Error.h"
#include "hurricane/Cell.h" #include "hurricane/Cell.h"
#include "hurricane/viewer/PyCellViewer.h"
#include "hurricane/isobar/PyCell.h" #include "hurricane/isobar/PyCell.h"
#include "hurricane/isobar/PyCellViewer.h"
#include "hurricane/isobar/Script.h" #include "hurricane/isobar/Script.h"

44
hurricane/src/viewer/CMakeLists.txt
View File

@ -36,17 +36,12 @@
hurricane/viewer/ControllerWidget.h hurricane/viewer/ControllerWidget.h
hurricane/viewer/ScriptWidget.h hurricane/viewer/ScriptWidget.h
) )
set ( exports hurricane/viewer/HApplication.h set ( includes hurricane/viewer/ScreenUtilities.h
hurricane/viewer/ScreenUtilities.h
hurricane/viewer/DisplayStyle.h hurricane/viewer/DisplayStyle.h
hurricane/viewer/ColorScale.h hurricane/viewer/ColorScale.h
hurricane/viewer/Graphics.h hurricane/viewer/Graphics.h
hurricane/viewer/GraphicsWidget.h
hurricane/viewer/ExceptionWidget.h
hurricane/viewer/BreakpointWidget.h
hurricane/viewer/MousePositionWidget.h
hurricane/viewer/GotoWidget.h
hurricane/viewer/Selector.h hurricane/viewer/Selector.h
hurricane/viewer/Ruler.h
hurricane/viewer/Command.h hurricane/viewer/Command.h
hurricane/viewer/AreaCommand.h hurricane/viewer/AreaCommand.h
hurricane/viewer/MoveCommand.h hurricane/viewer/MoveCommand.h
@ -55,21 +50,9 @@
hurricane/viewer/SelectCommand.h hurricane/viewer/SelectCommand.h
hurricane/viewer/HierarchyCommand.h hurricane/viewer/HierarchyCommand.h
hurricane/viewer/SelectorCriterion.h hurricane/viewer/SelectorCriterion.h
hurricane/viewer/CellWidget.h
hurricane/viewer/CellWidgets.h hurricane/viewer/CellWidgets.h
hurricane/viewer/CellViewer.h )
hurricane/viewer/InspectorWidget.h set ( pyincludes hurricane/viewer/PyCellViewer.h
hurricane/viewer/SelectionPopupModel.h
hurricane/viewer/SelectionPopup.h
hurricane/viewer/SelectionModel.h
hurricane/viewer/SelectionWidget.h
hurricane/viewer/Ruler.h
hurricane/viewer/NetInformations.h
hurricane/viewer/NetlistWidget.h
hurricane/viewer/DisplayFilterWidget.h
hurricane/viewer/ControllerWidget.h
hurricane/viewer/ScriptWidget.h
hurricane/viewer/PaletteWidget.h
) )
set ( cpps HApplication.cpp set ( cpps HApplication.cpp
ScreenUtilities.cpp ScreenUtilities.cpp
@ -112,12 +95,25 @@
ControllerWidget.cpp ControllerWidget.cpp
ScriptWidget.cpp ScriptWidget.cpp
) )
set ( pycpps PyViewer.cpp
PyCellViewer.cpp
)
qt4_wrap_cpp ( MOC_SRCS ${mocincludes} ) qt4_wrap_cpp ( MOC_SRCS ${mocincludes} )
qt4_add_resources ( RCC_SRCS CellViewer.qrc ) qt4_add_resources ( RCC_SRCS CellViewer.qrc )
add_library ( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ) add_library ( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ${pycpps} )
target_link_libraries ( viewer hurricane ${QT_LIBRARIES} ${Boost_LIBRARIES} ) target_link_libraries ( viewer hurricane ${QT_LIBRARIES} ${Boost_LIBRARIES} )
add_library ( Viewer MODULE ${pycpps} )
target_link_libraries ( Viewer viewer )
set_target_properties ( Viewer PROPERTIES
COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
PREFIX ""
)
install ( FILES ${exports} DESTINATION include/coriolis2/hurricane/viewer )
install ( TARGETS viewer DESTINATION lib${LIB_SUFFIX} ) install ( FILES ${includes}
${mocincludes}
${pyincludes} DESTINATION include/coriolis2/hurricane/viewer )
install ( TARGETS viewer DESTINATION lib${LIB_SUFFIX} )
install ( TARGETS Viewer DESTINATION ${PYTHON_SITE_PACKAGES} )

2
hurricane/src/isobar/PyCellViewer.cpp → hurricane/src/viewer/PyCellViewer.cpp
View File

@ -24,7 +24,7 @@
#include "hurricane/isobar/PyCell.h" #include "hurricane/isobar/PyCell.h"
#include "hurricane/isobar/PyCellViewer.h" #include "hurricane/viewer/PyCellViewer.h"
#include "hurricane/viewer/CellWidget.h" #include "hurricane/viewer/CellWidget.h"

12
hurricane/src/isobar/hurricane/isobar/PyCellViewer.h → hurricane/src/viewer/hurricane/viewer/PyCellViewer.h
View File

@ -23,14 +23,14 @@
// x-----------------------------------------------------------------x // x-----------------------------------------------------------------x
#ifndef __ISOBAR_CELL_VIEWER__ #ifndef __PY_HURRICANE_CELL_VIEWER__
#define __ISOBAR_CELL_VIEWER__ #define __PY_HURRICANE_CELL_VIEWER__
#include "hurricane/isobar/PyHurricane.h" #include "hurricane/isobar/PyHurricane.h"
#include "hurricane/viewer/CellViewer.h" #include "hurricane/viewer/CellViewer.h"
namespace Isobar { namespace Hurricane {
extern "C" { extern "C" {
@ -55,8 +55,8 @@ extern "C" {
#define IsPyCellViewer(v) ( (v)->ob_type == &PyTypeCellViewer ) #define IsPyCellViewer(v) ( (v)->ob_type == &PyTypeCellViewer )
#define ISOBARCELLVIEWER(v) ( (PyCellViewer*)(v) ) #define PYCELLVIEWER(v) ( (PyCellViewer*)(v) )
#define ISOBARCELLVIEWER_O(v) ( ISOBAR_CELL_VIEWER(v)->_object ) #define PYCELLVIEWER_O(v) ( ISOBAR_CELL_VIEWER(v)->_object )
} // End of extern "C". } // End of extern "C".
@ -65,4 +65,4 @@ extern "C" {
} // End of Isobar namespace. } // End of Isobar namespace.
#endif // __ISOBAR_CELL_VIEWER__ #endif // __PY_HURRICANE_CELL_VIEWER__