move hinspector to hviewer
to avoid cycles between libraries
This commit is contained in:
parent
62d5b757fb
commit
d17ecda179
|
@ -38,7 +38,7 @@ IF(UNIX)
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_PATH(HURRICANE_VIEWER_INCLUDE_PATH
|
FIND_PATH(HURRICANE_VIEWER_INCLUDE_PATH
|
||||||
NAMES hurricane/viewer/CellViewer.h hurricane/inspector/HInspectorWidget.h
|
NAMES hurricane/viewer/CellViewer.h hurricane/viewer/HInspectorWidget.h
|
||||||
PATHS ${HURRICANE_DIR_SEARCH}
|
PATHS ${HURRICANE_DIR_SEARCH}
|
||||||
PATH_SUFFIXES include
|
PATH_SUFFIXES include
|
||||||
# Help the user find it if we cannot.
|
# Help the user find it if we cannot.
|
||||||
|
@ -53,14 +53,6 @@ IF(UNIX)
|
||||||
DOC "The ${HURRICANE_INCLUDE_PATH_DESCRIPTION}"
|
DOC "The ${HURRICANE_INCLUDE_PATH_DESCRIPTION}"
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_LIBRARY(HURRICANE_INSPECTOR_LIBRARY_PATH
|
|
||||||
NAMES hinspector
|
|
||||||
PATHS ${HURRICANE_DIR_SEARCH}
|
|
||||||
PATH_SUFFIXES lib
|
|
||||||
# Help the user find it if we cannot.
|
|
||||||
DOC "The ${HURRICANE_INCLUDE_PATH_DESCRIPTION}"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Assume we didn't find it.
|
# Assume we didn't find it.
|
||||||
SET(HURRICANE_FOUND 0)
|
SET(HURRICANE_FOUND 0)
|
||||||
SET(HURRICANE_GRAPHICAL_FOUND 0)
|
SET(HURRICANE_GRAPHICAL_FOUND 0)
|
||||||
|
@ -89,10 +81,6 @@ IF(UNIX)
|
||||||
ENDIF(HURRICANE_VIEWER_LIBRARY_PATH)
|
ENDIF(HURRICANE_VIEWER_LIBRARY_PATH)
|
||||||
ENDIF(HURRICANE_VIEWER_INCLUDE_PATH)
|
ENDIF(HURRICANE_VIEWER_INCLUDE_PATH)
|
||||||
|
|
||||||
IF (HURRICANE_INSPECTOR_LIBRARY_PATH)
|
|
||||||
SET(HURRICANE_GRAPHICAL_LIBRARIES ${HURRICANE_GRAPHICAL_LIBRARIES} ${HURRICANE_INSPECTOR_LIBRARY_PATH})
|
|
||||||
ENDIF(HURRICANE_INSPECTOR_LIBRARY_PATH)
|
|
||||||
|
|
||||||
IF(HURRICANE_FOUND)
|
IF(HURRICANE_FOUND)
|
||||||
IF(NOT HURRICANE_FIND_QUIETLY)
|
IF(NOT HURRICANE_FIND_QUIETLY)
|
||||||
MESSAGE(STATUS "Found HURRICANE : ${HURRICANE_LIBRARIES}")
|
MESSAGE(STATUS "Found HURRICANE : ${HURRICANE_LIBRARIES}")
|
||||||
|
@ -108,7 +96,6 @@ IF(UNIX)
|
||||||
HURRICANE_LIBRARY_PATH
|
HURRICANE_LIBRARY_PATH
|
||||||
HURRICANE_GRAPHICAL_INCLUDE_PATH
|
HURRICANE_GRAPHICAL_INCLUDE_PATH
|
||||||
HURRICANE_VIEWER_LIBRARY_PATH
|
HURRICANE_VIEWER_LIBRARY_PATH
|
||||||
HURRICANE_INSPECTOR_LIBRARY_PATH
|
|
||||||
)
|
)
|
||||||
|
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
add_subdirectory(hurricane)
|
add_subdirectory(hurricane)
|
||||||
add_subdirectory(hinspector)
|
|
||||||
add_subdirectory(hviewer)
|
add_subdirectory(hviewer)
|
||||||
add_subdirectory(isobar)
|
add_subdirectory(isobar)
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
|
|
||||||
include ( ${QT_USE_FILE} )
|
|
||||||
|
|
||||||
include_directories ( ${HURRICANE_SOURCE_DIR}/src/hurricane
|
|
||||||
${HURRICANE_SOURCE_DIR}/src/hviewer
|
|
||||||
${HURRICANE_SOURCE_DIR}/src/hinspector
|
|
||||||
)
|
|
||||||
|
|
||||||
set ( mocincludes hurricane/inspector/RecordModel.h
|
|
||||||
hurricane/inspector/HInspectorWidget.h
|
|
||||||
)
|
|
||||||
set ( cpps RecordModel.cpp
|
|
||||||
HInspectorWidget.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
qt4_wrap_cpp ( MOC_SRCS ${mocincludes} )
|
|
||||||
|
|
||||||
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 )
|
|
|
@ -2,13 +2,12 @@
|
||||||
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/hinspector
|
${HURRICANE_SOURCE_DIR}/src/hviewer )
|
||||||
${HURRICANE_SOURCE_DIR}/src/hviewer
|
|
||||||
)
|
|
||||||
|
|
||||||
set ( includes hurricane/viewer/ScreenUtilities.h
|
set ( includes hurricane/viewer/ScreenUtilities.h
|
||||||
hurricane/viewer/DisplayStyle.h
|
hurricane/viewer/DisplayStyle.h
|
||||||
hurricane/viewer/Graphics.h
|
hurricane/viewer/Graphics.h
|
||||||
|
hurricane/viewer/HInspectorWidget.h
|
||||||
)
|
)
|
||||||
set ( mocincludes hurricane/viewer/PaletteEntry.h
|
set ( mocincludes hurricane/viewer/PaletteEntry.h
|
||||||
hurricane/viewer/LayerPaletteEntry.h
|
hurricane/viewer/LayerPaletteEntry.h
|
||||||
|
@ -17,6 +16,8 @@
|
||||||
hurricane/viewer/Palette.h
|
hurricane/viewer/Palette.h
|
||||||
hurricane/viewer/CellWidget.h
|
hurricane/viewer/CellWidget.h
|
||||||
hurricane/viewer/CellViewer.h
|
hurricane/viewer/CellViewer.h
|
||||||
|
hurricane/viewer/RecordModel.h
|
||||||
|
hurricane/viewer/HInspectorWidget.h
|
||||||
)
|
)
|
||||||
set ( exports hurricane/viewer/ScreenUtilities.h
|
set ( exports hurricane/viewer/ScreenUtilities.h
|
||||||
hurricane/viewer/PaletteEntry.h
|
hurricane/viewer/PaletteEntry.h
|
||||||
|
@ -35,6 +36,8 @@
|
||||||
Palette.cpp
|
Palette.cpp
|
||||||
CellWidget.cpp
|
CellWidget.cpp
|
||||||
CellViewer.cpp
|
CellViewer.cpp
|
||||||
|
RecordModel.cpp
|
||||||
|
HInspectorWidget.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
qt4_wrap_cpp ( MOC_SRCS ${mocincludes} )
|
qt4_wrap_cpp ( MOC_SRCS ${mocincludes} )
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#include "hurricane/viewer/Palette.h"
|
#include "hurricane/viewer/Palette.h"
|
||||||
#include "hurricane/viewer/CellWidget.h"
|
#include "hurricane/viewer/CellWidget.h"
|
||||||
#include "hurricane/viewer/CellViewer.h"
|
#include "hurricane/viewer/CellViewer.h"
|
||||||
#include "hurricane/inspector/HInspectorWidget.h"
|
#include "hurricane/viewer/HInspectorWidget.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
#include "hurricane/viewer/Graphics.h"
|
#include "hurricane/viewer/Graphics.h"
|
||||||
#include "hurricane/inspector/RecordModel.h"
|
#include "hurricane/viewer/RecordModel.h"
|
||||||
#include "hurricane/inspector/HInspectorWidget.h"
|
#include "hurricane/viewer/HInspectorWidget.h"
|
||||||
#include "hurricane/Slot.h"
|
#include "hurricane/Slot.h"
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include "hurricane/Name.h"
|
#include "hurricane/Name.h"
|
||||||
#include "hurricane/viewer/Graphics.h"
|
#include "hurricane/viewer/Graphics.h"
|
||||||
#include "hurricane/inspector/RecordModel.h"
|
#include "hurricane/viewer/RecordModel.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Hurricane {
|
namespace Hurricane {
|
Loading…
Reference in New Issue