* ./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
d788d1c559
commit
0d9443144b
|
@ -1,14 +1,22 @@
|
|||
include(${QT_USE_FILE})
|
||||
|
||||
include_directories(${HURRICANE_SOURCE_DIR}/src/hurricane)
|
||||
include ( ${QT_USE_FILE} )
|
||||
|
||||
set(mocincludes RecordModel.h HInspectorWidget.h)
|
||||
set(cpps RecordModel.cpp HInspectorWidget.cpp)
|
||||
include_directories ( ${HURRICANE_SOURCE_DIR}/src/hurricane
|
||||
${HURRICANE_SOURCE_DIR}/src/hinspector
|
||||
)
|
||||
|
||||
QT4_WRAP_CPP(MOC_SRCS ${mocincludes})
|
||||
set ( mocincludes hurricane/inspector/RecordModel.h
|
||||
hurricane/inspector/HInspectorWidget.h
|
||||
)
|
||||
set ( cpps RecordModel.cpp
|
||||
HInspectorWidget.cpp
|
||||
)
|
||||
|
||||
add_library(hinspector SHARED ${cpps} ${MOC_SRCS})
|
||||
target_link_libraries(hinspector ${QT_LIBRARIES} hurricane)
|
||||
qt4_wrap_cpp ( MOC_SRCS ${mocincludes} )
|
||||
|
||||
install(FILES HInspectorWidget.h DESTINATION /include/hurricane)
|
||||
install(TARGETS hinspector DESTINATION /lib)
|
||||
add_library ( hinspector SHARED ${cpps} ${MOC_SRCS} )
|
||||
target_link_libraries ( hinspector ${QT_LIBRARIES} hurricane )
|
||||
|
||||
install ( FILES hurricane/inspector/HInspectorWidget.h
|
||||
DESTINATION /include/hurricane/inspector )
|
||||
install ( TARGETS hinspector DESTINATION /lib )
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
#include <QGroupBox>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
#include "RecordModel.h"
|
||||
#include "HInspectorWidget.h"
|
||||
#include "hurricane/inspector/RecordModel.h"
|
||||
#include "hurricane/inspector/HInspectorWidget.h"
|
||||
|
||||
HInspectorWidget::HInspectorWidget(QWidget* parent):
|
||||
QWidget(parent),
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "RecordModel.h"
|
||||
#include "hurricane/inspector/RecordModel.h"
|
||||
|
||||
RecordModel::RecordModel(Record* r, QObject* parent):
|
||||
QAbstractTableModel(parent),
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef HINSPECTORWIDGET_H
|
||||
#define HINSPECTORWIDGET_H
|
||||
|
||||
#include "Commons.h"
|
||||
#include "hurricane/Commons.h"
|
||||
using namespace Hurricane;
|
||||
|
||||
#include <QWidget>
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include <QAbstractTableModel>
|
||||
|
||||
#include "Commons.h"
|
||||
#include "hurricane/Commons.h"
|
||||
using namespace Hurricane;
|
||||
|
||||
class RecordModel : public QAbstractTableModel {
|
Loading…
Reference in New Issue