X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FCMakeLists.txt;h=42b7be58571589a533629ad4bc9d481b61d80eca;hb=76b254e749b5fcb49f860cbdaa69e7bdd239a587;hp=dc39fbe20052e3a8748234c3333f6b86a2bc84bd;hpb=bfe9d3ccf8d5347b917d4c9e5e89413cebe51cc6;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt
index dc39fbe2..42b7be58 100644
--- a/src/HYDROGUI/CMakeLists.txt
+++ b/src/HYDROGUI/CMakeLists.txt
@@ -1,9 +1,9 @@
-include(../../CMake/Common.cmake)
+#include(../../CMake/Common.cmake)
 include(../../CMake/UseQT4EXT.cmake)
 
 set(PROJECT_HEADERS 
     HYDROGUI.h
-    HYDROGUI_AISCurve.h
+    HYDROGUI_AbstractDisplayer.h
     HYDROGUI_CalculationDlg.h
     HYDROGUI_CalculationOp.h
     HYDROGUI_ColorWidget.h
@@ -32,6 +32,8 @@ set(PROJECT_HEADERS
     HYDROGUI_Operations.h
     HYDROGUI_PolylineDlg.h
     HYDROGUI_PolylineOp.h
+    HYDROGUI_ProfileDlg.h
+    HYDROGUI_ProfileOp.h
     HYDROGUI_Prs.h
     HYDROGUI_PrsDriver.h
     HYDROGUI_PrsImage.h
@@ -42,6 +44,7 @@ set(PROJECT_HEADERS
     HYDROGUI_PrsZone.h
     HYDROGUI_PrsZoneDriver.h
     HYDROGUI_Region.h
+    HYDROGUI_RemoveImageRefsOp.h
     HYDROGUI_Shape.h
     HYDROGUI_ShowHideOp.h
     HYDROGUI_Tool.h
@@ -50,14 +53,28 @@ set(PROJECT_HEADERS
     HYDROGUI_UpdateFlags.h
     HYDROGUI_UpdateImageOp.h
     HYDROGUI_VisualStateOp.h
+    HYDROGUI_VTKPrs.h
+    HYDROGUI_VTKPrsBathymetry.h
+    HYDROGUI_VTKPrsBathymetryDriver.h
+    HYDROGUI_VTKPrsDisplayer.h
+    HYDROGUI_VTKPrsDriver.h
     HYDROGUI_Wizard.h
     HYDROGUI_Zone.h
+    HYDROGUI_ImportGeomObjectOp.h
+    HYDROGUI_ImportObstacleFromFileOp.h
+    HYDROGUI_ExportCalculationOp.h
+    HYDROGUI_ObstacleDlg.h
+    HYDROGUI_SetColorOp.h
+    HYDROGUI_ColorDlg.h
+    HYDROGUI_ImportProfilesOp.h
+    HYDROGUI_GeoreferencementDlg.h
+    HYDROGUI_GeoreferencementOp.h
 )
 
 QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
 
 set(PROJECT_SOURCES 
-    HYDROGUI_AISCurve.cxx
+    HYDROGUI_AbstractDisplayer.cxx
     HYDROGUI_CalculationDlg.cxx
     HYDROGUI_CalculationOp.cxx
     HYDROGUI_ColorWidget.cxx
@@ -86,6 +103,8 @@ set(PROJECT_SOURCES
     HYDROGUI_Operations.cxx
     HYDROGUI_PolylineDlg.cxx
     HYDROGUI_PolylineOp.cxx
+    HYDROGUI_ProfileDlg.cxx
+    HYDROGUI_ProfileOp.cxx
     HYDROGUI_Prs.cxx
     HYDROGUI_PrsDriver.cxx
     HYDROGUI_PrsImage.cxx
@@ -96,6 +115,7 @@ set(PROJECT_SOURCES
     HYDROGUI_PrsZone.cxx
     HYDROGUI_PrsZoneDriver.cxx
     HYDROGUI_Region.cxx
+    HYDROGUI_RemoveImageRefsOp.cxx
     HYDROGUI_Shape.cxx
     HYDROGUI_ShowHideOp.cxx
     HYDROGUI_Tool.cxx
@@ -103,33 +123,57 @@ set(PROJECT_SOURCES
     HYDROGUI_TwoImagesOp.cxx
     HYDROGUI_UpdateImageOp.cxx
     HYDROGUI_VisualStateOp.cxx
+    HYDROGUI_VTKPrs.cxx
+    HYDROGUI_VTKPrsBathymetry.cxx
+    HYDROGUI_VTKPrsBathymetryDriver.cxx
+    HYDROGUI_VTKPrsDisplayer.cxx
+    HYDROGUI_VTKPrsDriver.cxx
     HYDROGUI_Wizard.cxx
     HYDROGUI_Zone.cxx
+    HYDROGUI_ImportGeomObjectOp.cxx
+    HYDROGUI_ImportObstacleFromFileOp.cxx
+    HYDROGUI_ExportCalculationOp.cxx
+    HYDROGUI_ObstacleDlg.cxx
+    HYDROGUI_SetColorOp.cxx
+    HYDROGUI_ColorDlg.cxx
+    HYDROGUI_ImportProfilesOp.cxx
+    HYDROGUI_GeoreferencementDlg.cxx
+    HYDROGUI_GeoreferencementOp.cxx
 )
 
 add_definitions(
   -DHYDROGUI_EXPORTS
   ${CAS_DEFINITIONS}
+  ${OMNIORB_DEFINITIONS}
   ${QT_DEFINITIONS}
-  $(GUI_CXXFLAGS)
-  $(GEOM_CXXFLAGS)
+#  $(GUI_CXXFLAGS)
+  ${GUI_DEFINITIONS}
+#  $(GEOM_CXXFLAGS)
+  ${GEOM_DEFINITIONS}
 )
 
 include_directories(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
-  ${GUI_ROOT_DIR}/include/salome
-  ${GEOM_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 HYDROData 
+target_link_libraries(HYDROGUI HYDROData HYDROCurveCreator
     ${CAS_TKV3d} ${CAS_TKTopAlgo} ${CAS_TKBrep} ${CAS_TKBO}
-    ${LightApp} ${CAM} ${suit} ${qtx} ${ObjBrowser} ${GraphicsView} ${std} ${Event} ${OCCViewer}
-    ${CurveCreator}
+    ${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)
 
@@ -139,13 +183,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})