X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FCMakeLists.txt;h=612e9be9cac2c66671ba3bf7913a2b8b300a86c4;hb=fc42f9cabfa130d72aea8c10f003d6bec315b6c6;hp=9f2554a3044a3cf38019291223b67aa6222f9937;hpb=16b8dd948d4cadb6b06a34786eca8bee8eb4ea08;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt
index 9f2554a3..612e9be9 100644
--- a/src/HYDROGUI/CMakeLists.txt
+++ b/src/HYDROGUI/CMakeLists.txt
@@ -1,42 +1,213 @@
-include(../../CMake/Common.cmake)
+#include(../../CMake/Common.cmake)
 include(../../CMake/UseQT4EXT.cmake)
 
 set(PROJECT_HEADERS 
     HYDROGUI.h
+    HYDROGUI_AbstractDisplayer.h
+    HYDROGUI_AISTrihedron.h
+    HYDROGUI_CalculationDlg.h
+    HYDROGUI_CalculationOp.h
+    HYDROGUI_ChannelDlg.h
+    HYDROGUI_ChannelOp.h
+    HYDROGUI_ColorWidget.h
+    HYDROGUI_CopyPasteOp.h
+    HYDROGUI_CopyPastePositionOp.h
+    HYDROGUI_DataBrowser.h
+    HYDROGUI_DataModel.h
+    HYDROGUI_DataObject.h
+    HYDROGUI_DeleteDlg.h
+    HYDROGUI_DeleteOp.h
+    HYDROGUI_DigueDlg.h
+    HYDROGUI_DigueOp.h
+    HYDROGUI_Displayer.h
+    HYDROGUI_ExportImageOp.h
+    HYDROGUI_GVSelector.h
+    HYDROGUI_ImmersibleZoneDlg.h
+    HYDROGUI_ImmersibleZoneOp.h
+    HYDROGUI_ImportBathymetryDlg.h
+    HYDROGUI_ImportBathymetryOp.h
+    HYDROGUI_ImportImageDlg.h
+    HYDROGUI_ImportImageOp.h
     HYDROGUI_InputPanel.h
     HYDROGUI_Module.h
+    HYDROGUI_NameValidator.h
     HYDROGUI_ObjSelector.h
+    HYDROGUI_ObserveImageOp.h
+    HYDROGUI_OCCDisplayer.h
+    HYDROGUI_OCCSelector.h
     HYDROGUI_Operation.h
     HYDROGUI_Operations.h
+    HYDROGUI_Poly3DDlg.h
+    HYDROGUI_Poly3DOp.h
+    HYDROGUI_PolylineDlg.h
+    HYDROGUI_PolylineOp.h
+    HYDROGUI_ProfileDlg.h
+    HYDROGUI_ProfileOp.h
+    HYDROGUI_Prs.h
+    HYDROGUI_PrsDriver.h
+    HYDROGUI_PrsImage.h
+    HYDROGUI_PrsImageDriver.h
+    HYDROGUI_PrsImageFrame.h
+    HYDROGUI_PrsPolyline.h
+    HYDROGUI_PrsPolylineDriver.h
+    HYDROGUI_PrsZone.h
+    HYDROGUI_PrsZoneDriver.h
+    HYDROGUI_Region.h
+    HYDROGUI_RemoveImageRefsOp.h
+    HYDROGUI_Shape.h
+    HYDROGUI_ShowHideOp.h
+    HYDROGUI_StreamDlg.h
+    HYDROGUI_StreamOp.h
+    HYDROGUI_Tool.h
+    HYDROGUI_TwoImagesDlg.h
+    HYDROGUI_TwoImagesOp.h
+    HYDROGUI_UpdateFlags.h
+    HYDROGUI_UpdateObjectOp.h
+    HYDROGUI_VisualStateOp.h
+    HYDROGUI_VTKPrs.h
+    HYDROGUI_VTKPrsBathymetry.h
+    HYDROGUI_VTKPrsBathymetryDriver.h
+    HYDROGUI_VTKPrsDisplayer.h
+    HYDROGUI_VTKPrsDriver.h
+    HYDROGUI_VTKPrsShape.h
+    HYDROGUI_VTKPrsShapeDriver.h
+    HYDROGUI_Wizard.h
+    HYDROGUI_Zone.h
+    HYDROGUI_ImportGeomObjectOp.h
+    HYDROGUI_ImportObstacleFromFileOp.h
+    HYDROGUI_ExportCalculationOp.h
+    HYDROGUI_GeomObjectDlg.h
+    HYDROGUI_SetColorOp.h
+    HYDROGUI_ColorDlg.h
+    HYDROGUI_ImportProfilesOp.h
+    HYDROGUI_GeoreferencementDlg.h
+    HYDROGUI_GeoreferencementOp.h
+    HYDROGUI_Actor.h
+    HYDROGUI_BathymetryBoundsOp.h
+    HYDROGUI_TranslateObstacleDlg.h
+    HYDROGUI_TranslateObstacleOp.h
 )
 
 QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
 
 set(PROJECT_SOURCES 
+    HYDROGUI_AbstractDisplayer.cxx
+    HYDROGUI_AISTrihedron.cxx
+    HYDROGUI_CalculationDlg.cxx
+    HYDROGUI_CalculationOp.cxx
+    HYDROGUI_ChannelDlg.cxx
+    HYDROGUI_ChannelOp.cxx
+    HYDROGUI_ColorWidget.cxx
+    HYDROGUI_CopyPasteOp.cxx
+    HYDROGUI_CopyPastePositionOp.cxx
+    HYDROGUI_DataBrowser.cxx
+    HYDROGUI_DataModel.cxx
+    HYDROGUI_DataObject.cxx
+    HYDROGUI_DeleteDlg.cxx
+    HYDROGUI_DeleteOp.cxx
+    HYDROGUI_DigueDlg.cxx
+    HYDROGUI_DigueOp.cxx
+    HYDROGUI_Displayer.cxx
+    HYDROGUI_ExportImageOp.cxx
+    HYDROGUI_GVSelector.cxx
+    HYDROGUI_ImmersibleZoneDlg.cxx
+    HYDROGUI_ImmersibleZoneOp.cxx
+    HYDROGUI_ImportBathymetryDlg.cxx
+    HYDROGUI_ImportBathymetryOp.cxx
+    HYDROGUI_ImportImageDlg.cxx
+    HYDROGUI_ImportImageOp.cxx
     HYDROGUI_InputPanel.cxx
     HYDROGUI_Module.cxx
+    HYDROGUI_NameValidator.cxx
     HYDROGUI_ObjSelector.cxx
+    HYDROGUI_ObserveImageOp.cxx
+    HYDROGUI_OCCDisplayer.cxx
+    HYDROGUI_OCCSelector.cxx
     HYDROGUI_Operation.cxx
     HYDROGUI_Operations.cxx
+    HYDROGUI_Poly3DDlg.cxx
+    HYDROGUI_Poly3DOp.cxx
+    HYDROGUI_PolylineDlg.cxx
+    HYDROGUI_PolylineOp.cxx
+    HYDROGUI_ProfileDlg.cxx
+    HYDROGUI_ProfileOp.cxx
+    HYDROGUI_Prs.cxx
+    HYDROGUI_PrsDriver.cxx
+    HYDROGUI_PrsImage.cxx
+    HYDROGUI_PrsImageDriver.cxx
+    HYDROGUI_PrsImageFrame.cxx
+    HYDROGUI_PrsPolyline.cxx
+    HYDROGUI_PrsPolylineDriver.cxx
+    HYDROGUI_PrsZone.cxx
+    HYDROGUI_PrsZoneDriver.cxx
+    HYDROGUI_Region.cxx
+    HYDROGUI_RemoveImageRefsOp.cxx
+    HYDROGUI_Shape.cxx
+    HYDROGUI_ShowHideOp.cxx
+    HYDROGUI_StreamDlg.cxx
+    HYDROGUI_StreamOp.cxx
+    HYDROGUI_Tool.cxx
+    HYDROGUI_TwoImagesDlg.cxx
+    HYDROGUI_TwoImagesOp.cxx
+    HYDROGUI_UpdateObjectOp.cxx
+    HYDROGUI_VisualStateOp.cxx
+    HYDROGUI_VTKPrs.cxx
+    HYDROGUI_VTKPrsBathymetry.cxx
+    HYDROGUI_VTKPrsBathymetryDriver.cxx
+    HYDROGUI_VTKPrsDisplayer.cxx
+    HYDROGUI_VTKPrsDriver.cxx
+    HYDROGUI_VTKPrsShape.cxx
+    HYDROGUI_VTKPrsShapeDriver.cxx
+    HYDROGUI_Wizard.cxx
+    HYDROGUI_Zone.cxx
+    HYDROGUI_ImportGeomObjectOp.cxx
+    HYDROGUI_ImportObstacleFromFileOp.cxx
+    HYDROGUI_ExportCalculationOp.cxx
+    HYDROGUI_GeomObjectDlg.cxx
+    HYDROGUI_SetColorOp.cxx
+    HYDROGUI_ColorDlg.cxx
+    HYDROGUI_ImportProfilesOp.cxx
+    HYDROGUI_GeoreferencementDlg.cxx
+    HYDROGUI_GeoreferencementOp.cxx
+    HYDROGUI_Actor.cxx
+    HYDROGUI_BathymetryBoundsOp.cxx
+    HYDROGUI_TranslateObstacleDlg.cxx
+    HYDROGUI_TranslateObstacleOp.cxx
 )
 
 add_definitions(
   -DHYDROGUI_EXPORTS
   ${CAS_DEFINITIONS}
+  ${OMNIORB_DEFINITIONS}
   ${QT_DEFINITIONS}
-  $(GUI_CXXFLAGS)
+#  $(GUI_CXXFLAGS)
+  ${GUI_DEFINITIONS}
+#  $(GEOM_CXXFLAGS)
+  ${GEOM_DEFINITIONS}
 )
 
 include_directories(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
-  ${GUI_ROOT_DIR}/include/salome
+#  ${GUI_ROOT_DIR}/include/salome
+  ${GUI_INCLUDE_DIRS}
+#  ${GEOM_ROOT_DIR}/include/salome
+  ${GEOM_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
+  ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROCurveCreator
+  ${VTK_INCLUDE_DIRS}
 )
 
+
 add_library(HYDROGUI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${PROJECT_HEADERS_MOC})
-target_link_libraries(HYDROGUI ${CAS_OCAF})
+target_link_libraries(HYDROGUI HYDROData HYDROCurveCreator
+    ${CAS_TKV3d} ${CAS_TKTopAlgo} ${CAS_TKBrep} ${CAS_TKBO}
+    ${GUI_LightApp} ${GUI_CAM} ${GUI_suit} ${GUI_qtx} ${GUI_ObjBrowser} ${GUI_GraphicsView} ${GUI_std} 
+    ${GUI_Event} ${GUI_OCCViewer} ${GEOM_GEOM} ${GEOM_GEOMBase}
+    ${VTK_LIBRARIES} ${SVTK} ${SalomeObject} ${SalomePrs}
+    )
+INSTALL(TARGETS HYDROGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 set(PROJECT_LIBRARIES HYDROGUI)
 
@@ -46,12 +217,13 @@ set(GUITS_SOURCES
   resources/HYDROGUI_msg_fr.ts
 )
 
-include(../../CMake/CommonInstall.cmake)
+#include(../../CMake/CommonInstall.cmake)
 
 # resources
-QT4_INSTALL_TS_RESOURCES("${GUITS_SOURCES}" "${HYDRO_salomeres_DATA}")
+QT4_INSTALL_TS_RESOURCES("${GUITS_SOURCES}" "${SALOME_HYDRO_INSTALL_RES_DATA}")
 
 FILE(GLOB GUIPNG_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.png")
 FILE(GLOB GUIXML_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.xml")
 SET(GUI_DATA ${GUIPNG_DATA} ${GUIXML_DATA})
-INSTALL(FILES ${GUI_DATA} DESTINATION ${HYDRO_salomeres_DATA})
+INSTALL(FILES ${GUI_DATA} DESTINATION ${SALOME_HYDRO_INSTALL_RES_DATA})
+