reorganization

This commit is contained in:
Christophe Alexandre 2008-01-04 16:55:28 +00:00
parent 25de8ef96d
commit 9322a046f0
5 changed files with 13 additions and 12 deletions

View File

@ -10,7 +10,8 @@ find_package(FLEX REQUIRED)
add_subdirectory(hurricane) add_subdirectory(hurricane)
add_subdirectory(analogic) add_subdirectory(analogic)
add_subdirectory(graphical) add_subdirectory(viewer)
add_subdirectory(editor)
set(DEST_DIR "$ENV{DESTDIR}") set(DEST_DIR "$ENV{DESTDIR}")
configure_file(${HURRICANE_SOURCE_DIR}/hurricane.pc.cmake hurricane.pc @ONLY) configure_file(${HURRICANE_SOURCE_DIR}/hurricane.pc.cmake hurricane.pc @ONLY)

View File

@ -5,9 +5,9 @@ include_directories(${HURRICANE_SOURCE_DIR}/hurricane)
set(includes InstanceFigure.h Utils.h) set(includes InstanceFigure.h Utils.h)
set(cpps InstanceFigure.cpp CellScene.cpp) set(cpps InstanceFigure.cpp CellScene.cpp)
add_library(hurricanefigs SHARED ${cpps}) add_library(hurricaneeditor SHARED ${cpps})
target_link_libraries(hurricanefigs ${QT_LIBRARIES} hurricane) target_link_libraries(hurricaneeditor ${QT_LIBRARIES} hurricane)
install(FILES ${includes} DESTINATION /include/hurricane) install(FILES ${includes} DESTINATION /include/hurricane)
install(TARGETS hurricanefigs DESTINATION /lib) install(TARGETS hurricaneeditor DESTINATION /lib)

View File

@ -8,10 +8,10 @@
using namespace H; using namespace H;
inline void BoxToRectangle(const Box& box, QRectF& rec) { inline void BoxToRectangle(const Box& box, QRectF& rec) {
double xmin = GetValue(box.GetXMin()); double xmin = GetValue(box.getXMin());
double xmax = GetValue(box.GetXMax()); double xmax = GetValue(box.getXMax());
double ymin = GetValue(box.GetYMin()); double ymin = GetValue(box.getYMin());
double ymax = GetValue(box.GetYMax()); double ymax = GetValue(box.getYMax());
rec.setCoords(xmin, ymin, xmax, ymax); rec.setCoords(xmin, ymin, xmax, ymax);
} }

View File

@ -6,5 +6,5 @@ includedir=${exec_prefix}/include
Name: hurricane Name: hurricane
Description: Hurricane Libs Description: Hurricane Libs
Version: 2.0.b Version: 2.0.b
Libs: -L${libdir} -lanalogic -lhurricanefigs -lhurricane Libs: -L${libdir} -lanalogic -lhurricaneviewer -lhurricane
Cflags: -I${includedir}/hurricane Cflags: -I${includedir}/hurricane

View File

@ -5,8 +5,8 @@ include_directories(${HURRICANE_SOURCE_DIR}/hurricane)
set(includes CellWidget.h) set(includes CellWidget.h)
set(cpps CellWidget.cpp) set(cpps CellWidget.cpp)
add_library(hurricanefigs SHARED ${cpps}) add_library(hurricaneviewer SHARED ${cpps})
target_link_libraries(hurricanefigs ${QT_LIBRARIES} hurricane) target_link_libraries(hurricaneviewer ${QT_LIBRARIES} hurricane)
install(FILES ${includes} DESTINATION /include/hurricane) install(FILES ${includes} DESTINATION /include/hurricane)
install(TARGETS hurricanefigs DESTINATION /lib) install(TARGETS hurricaneviewer DESTINATION /lib)