* ./hurricane/src :
- Complete include re-organisation. include/hurricane/*.h : kernel. include/hurricane/viewer/*.h : hviewer. include/hurricane/inspector/*.h : hinspector. Includes have been moved into subdirectories of .cpp files (as in crlcore). - Now you must include files like this : #include <hurricane/Layer.h> #include <hurricane/viewer/CellViewer.h> #include <hurricane/inspector/HInspector.h> - Suppressed viewer specific include path in FindHURRICANE.cmake. - Re-enabled documentation, with dot disabled as it seems to slow down doxygen. * ./crlcore/src/crlcore : - Adapted to new Hurricane include scheme. Corrected bugs in it's own include files (noticeably "Utilities.h").
This commit is contained in:
parent
0d9443144b
commit
2d757752a9
|
@ -1,26 +1,28 @@
|
||||||
|
|
||||||
include ( ${QT_USE_FILE} )
|
include ( ${QT_USE_FILE} )
|
||||||
|
|
||||||
include_directories ( ${HURRICANE_SOURCE_DIR}/src/hurricane )
|
include_directories ( ${HURRICANE_SOURCE_DIR}/src/hurricane
|
||||||
|
${HURRICANE_SOURCE_DIR}/src/hviewer
|
||||||
|
)
|
||||||
|
|
||||||
set ( includes ScreenUtilities.h
|
set ( includes hurricane/viewer/ScreenUtilities.h
|
||||||
DisplayStyle.h
|
hurricane/viewer/DisplayStyle.h
|
||||||
Graphics.h
|
hurricane/viewer/Graphics.h
|
||||||
)
|
)
|
||||||
set ( mocincludes PaletteEntry.h
|
set ( mocincludes hurricane/viewer/PaletteEntry.h
|
||||||
LayerPaletteEntry.h
|
hurricane/viewer/LayerPaletteEntry.h
|
||||||
GroupPaletteEntry.h
|
hurricane/viewer/GroupPaletteEntry.h
|
||||||
ViewerPaletteEntry.h
|
hurricane/viewer/ViewerPaletteEntry.h
|
||||||
Palette.h
|
hurricane/viewer/Palette.h
|
||||||
CellWidget.h
|
hurricane/viewer/CellWidget.h
|
||||||
CellViewer.h
|
hurricane/viewer/CellViewer.h
|
||||||
)
|
)
|
||||||
set ( exports ScreenUtilities.h
|
set ( exports hurricane/viewer/ScreenUtilities.h
|
||||||
PaletteEntry.h
|
hurricane/viewer/PaletteEntry.h
|
||||||
Palette.h
|
hurricane/viewer/Palette.h
|
||||||
DisplayStyle.h
|
hurricane/viewer/DisplayStyle.h
|
||||||
Graphics.h
|
hurricane/viewer/Graphics.h
|
||||||
CellViewer.h
|
hurricane/viewer/CellViewer.h
|
||||||
)
|
)
|
||||||
set ( cpps ScreenUtilities.cpp
|
set ( cpps ScreenUtilities.cpp
|
||||||
DisplayStyle.cpp
|
DisplayStyle.cpp
|
||||||
|
@ -40,5 +42,5 @@
|
||||||
add_library ( hviewer SHARED ${cpps} ${MOC_SRCS} ${RCC_SRCS} )
|
add_library ( hviewer SHARED ${cpps} ${MOC_SRCS} ${RCC_SRCS} )
|
||||||
target_link_libraries ( hviewer ${QT_LIBRARIES} hurricane )
|
target_link_libraries ( hviewer ${QT_LIBRARIES} hurricane )
|
||||||
|
|
||||||
install ( FILES ${exports} DESTINATION /include/hurricane )
|
install ( FILES ${exports} DESTINATION /include/hurricane/viewer )
|
||||||
install ( TARGETS hviewer DESTINATION /lib )
|
install ( TARGETS hviewer DESTINATION /lib )
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
# include <QMenuBar>
|
# include <QMenuBar>
|
||||||
# include <QDockWidget>
|
# include <QDockWidget>
|
||||||
|
|
||||||
# include "Cell.h"
|
# include "hurricane/Cell.h"
|
||||||
|
|
||||||
//# include "MapView.h"
|
//# include "MapView.h"
|
||||||
# include "Palette.h"
|
# include "hurricane/viewer/Palette.h"
|
||||||
# include "CellWidget.h"
|
# include "hurricane/viewer/CellWidget.h"
|
||||||
# include "CellViewer.h"
|
# include "hurricane/viewer/CellViewer.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
||||||
|
|
|
@ -9,20 +9,20 @@
|
||||||
# include <QStylePainter>
|
# include <QStylePainter>
|
||||||
# include <QBitmap>
|
# include <QBitmap>
|
||||||
|
|
||||||
# include "DataBase.h"
|
# include "hurricane/DataBase.h"
|
||||||
# include "Technology.h"
|
# include "hurricane/Technology.h"
|
||||||
# include "BasicLayer.h"
|
# include "hurricane/BasicLayer.h"
|
||||||
# include "Cell.h"
|
# include "hurricane/Cell.h"
|
||||||
# include "Instance.h"
|
# include "hurricane/Instance.h"
|
||||||
# include "Slice.h"
|
# include "hurricane/Slice.h"
|
||||||
# include "Segment.h"
|
# include "hurricane/Segment.h"
|
||||||
# include "Contact.h"
|
# include "hurricane/Contact.h"
|
||||||
|
|
||||||
# include "Graphics.h"
|
# include "hurricane/viewer/Graphics.h"
|
||||||
# include "PaletteEntry.h"
|
# include "hurricane/viewer/PaletteEntry.h"
|
||||||
# include "Palette.h"
|
# include "hurricane/viewer/Palette.h"
|
||||||
// # include "MapView.h"
|
// # include "MapView.h"
|
||||||
# include "CellWidget.h"
|
# include "hurricane/viewer/CellWidget.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
# include <cassert>
|
# include <cassert>
|
||||||
|
|
||||||
# include "DisplayStyle.h"
|
# include "hurricane/viewer/DisplayStyle.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -10,10 +10,10 @@
|
||||||
# include <QFont>
|
# include <QFont>
|
||||||
# include <QApplication>
|
# include <QApplication>
|
||||||
|
|
||||||
# include "Name.h"
|
# include "hurricane/Name.h"
|
||||||
|
|
||||||
# include "DisplayStyle.h"
|
# include "hurricane/viewer/DisplayStyle.h"
|
||||||
# include "Graphics.h"
|
# include "hurricane/viewer/Graphics.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
# include <QPushButton>
|
# include <QPushButton>
|
||||||
# include <QHBoxLayout>
|
# include <QHBoxLayout>
|
||||||
|
|
||||||
# include "Graphics.h"
|
# include "hurricane/viewer/Graphics.h"
|
||||||
# include "GroupPaletteEntry.h"
|
# include "hurricane/viewer/GroupPaletteEntry.h"
|
||||||
# include "Palette.h"
|
# include "hurricane/viewer/Palette.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
# include <QCheckBox>
|
# include <QCheckBox>
|
||||||
# include <QHBoxLayout>
|
# include <QHBoxLayout>
|
||||||
|
|
||||||
# include "BasicLayer.h"
|
# include "hurricane/BasicLayer.h"
|
||||||
|
|
||||||
# include "Graphics.h"
|
# include "hurricane/viewer/Graphics.h"
|
||||||
# include "LayerPaletteEntry.h"
|
# include "hurricane/viewer/LayerPaletteEntry.h"
|
||||||
# include "Palette.h"
|
# include "hurricane/viewer/Palette.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
||||||
|
|
|
@ -9,19 +9,19 @@
|
||||||
# include <QCheckBox>
|
# include <QCheckBox>
|
||||||
# include <QPushButton>
|
# include <QPushButton>
|
||||||
|
|
||||||
# include "Name.h"
|
# include "hurricane/Name.h"
|
||||||
# include "DataBase.h"
|
# include "hurricane/DataBase.h"
|
||||||
# include "Technology.h"
|
# include "hurricane/Technology.h"
|
||||||
# include "BasicLayer.h"
|
# include "hurricane/BasicLayer.h"
|
||||||
# include "BasicLayers.h"
|
# include "hurricane/BasicLayers.h"
|
||||||
|
|
||||||
# include "Graphics.h"
|
# include "hurricane/viewer/Graphics.h"
|
||||||
# include "PaletteEntry.h"
|
# include "hurricane/viewer/PaletteEntry.h"
|
||||||
# include "LayerPaletteEntry.h"
|
# include "hurricane/viewer/LayerPaletteEntry.h"
|
||||||
# include "GroupPaletteEntry.h"
|
# include "hurricane/viewer/GroupPaletteEntry.h"
|
||||||
# include "ViewerPaletteEntry.h"
|
# include "hurricane/viewer/ViewerPaletteEntry.h"
|
||||||
# include "Palette.h"
|
# include "hurricane/viewer/Palette.h"
|
||||||
# include "CellWidget.h"
|
# include "hurricane/viewer/CellWidget.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
# include <QPainter>
|
# include <QPainter>
|
||||||
|
|
||||||
# include "Graphics.h"
|
# include "hurricane/viewer/Graphics.h"
|
||||||
# include "PaletteEntry.h"
|
# include "hurricane/viewer/PaletteEntry.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
|
|
||||||
# include <QBitmap>
|
# include <QBitmap>
|
||||||
|
|
||||||
# include "BasicLayer.h"
|
# include "hurricane/BasicLayer.h"
|
||||||
|
|
||||||
# include "ScreenUtilities.h"
|
# include "hurricane/viewer/ScreenUtilities.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
# include <QCheckBox>
|
# include <QCheckBox>
|
||||||
# include <QHBoxLayout>
|
# include <QHBoxLayout>
|
||||||
|
|
||||||
# include "BasicLayer.h"
|
# include "hurricane/BasicLayer.h"
|
||||||
|
|
||||||
# include "Graphics.h"
|
# include "hurricane/viewer/Graphics.h"
|
||||||
# include "ViewerPaletteEntry.h"
|
# include "hurricane/viewer/ViewerPaletteEntry.h"
|
||||||
# include "Palette.h"
|
# include "hurricane/viewer/Palette.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
||||||
|
|
|
@ -14,7 +14,7 @@ class QKeyEvent;
|
||||||
class QAction;
|
class QAction;
|
||||||
class QMenu;
|
class QMenu;
|
||||||
|
|
||||||
# include "Commons.h"
|
# include "hurricane/Commons.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -22,12 +22,12 @@ class QKeyEvent;
|
||||||
class QAction;
|
class QAction;
|
||||||
|
|
||||||
|
|
||||||
# include "Commons.h"
|
# include "hurricane/Commons.h"
|
||||||
# include "Point.h"
|
# include "hurricane/Point.h"
|
||||||
# include "Box.h"
|
# include "hurricane/Box.h"
|
||||||
# include "Transformation.h"
|
# include "hurricane/Transformation.h"
|
||||||
|
|
||||||
# include "DisplayStyle.h"
|
# include "hurricane/viewer/DisplayStyle.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -13,10 +13,10 @@
|
||||||
# include <QPen>
|
# include <QPen>
|
||||||
# include <QBrush>
|
# include <QBrush>
|
||||||
|
|
||||||
# include "Commons.h"
|
# include "hurricane/Commons.h"
|
||||||
# include "Name.h"
|
# include "hurricane/Name.h"
|
||||||
|
|
||||||
# include "ScreenUtilities.h"
|
# include "hurricane/viewer/ScreenUtilities.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
|
@ -9,7 +9,7 @@
|
||||||
# include <string>
|
# include <string>
|
||||||
# include <vector>
|
# include <vector>
|
||||||
|
|
||||||
# include "DisplayStyle.h"
|
# include "hurricane/viewer/DisplayStyle.h"
|
||||||
|
|
||||||
class QFont;
|
class QFont;
|
||||||
class QColor;
|
class QColor;
|
|
@ -8,9 +8,9 @@
|
||||||
|
|
||||||
class QPushButton;
|
class QPushButton;
|
||||||
|
|
||||||
# include "Name.h"
|
# include "hurricane/Name.h"
|
||||||
|
|
||||||
# include "PaletteEntry.h"
|
# include "hurricane/viewer/PaletteEntry.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
class QCheckBox;
|
class QCheckBox;
|
||||||
|
|
||||||
# include "PaletteEntry.h"
|
# include "hurricane/viewer/PaletteEntry.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
|
@ -10,7 +10,7 @@
|
||||||
# include <QScrollArea>
|
# include <QScrollArea>
|
||||||
# include <QPixmap>
|
# include <QPixmap>
|
||||||
|
|
||||||
# include "Commons.h"
|
# include "hurricane/Commons.h"
|
||||||
|
|
||||||
|
|
||||||
class QCheckBox;
|
class QCheckBox;
|
|
@ -12,7 +12,7 @@
|
||||||
class QPaintEvent;
|
class QPaintEvent;
|
||||||
class QCheckBox;
|
class QCheckBox;
|
||||||
|
|
||||||
# include "Commons.h"
|
# include "hurricane/Commons.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
|
@ -8,7 +8,7 @@
|
||||||
# include <string>
|
# include <string>
|
||||||
# include <QBrush>
|
# include <QBrush>
|
||||||
|
|
||||||
# include "Commons.h"
|
# include "hurricane/Commons.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
|
@ -8,8 +8,8 @@
|
||||||
|
|
||||||
class QCheckBox;
|
class QCheckBox;
|
||||||
|
|
||||||
# include "Name.h"
|
# include "hurricane/Name.h"
|
||||||
# include "PaletteEntry.h"
|
# include "hurricane/viewer/PaletteEntry.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
Loading…
Reference in New Issue