refs #550: fix crash when myObject is NULL

[modules/hydro.git] / src / HYDROGUI / CMakeLists.txt

diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt
index 942135c30e342fd68969485c14d4ae97202c0071..e6417fd98c1d682a02e47c359bda2c0905a3e66a 100644 (file)
--- a/src/HYDROGUI/CMakeLists.txt
+++ b/src/HYDROGUI/CMakeLists.txt
@@ -1,9 +1,11 @@
 #include(../../CMake/Common.cmake)
 include(../../CMake/UseQT4EXT.cmake)
-
+ 
 set(PROJECT_HEADERS 
     HYDROGUI.h
     HYDROGUI_AbstractDisplayer.h
+    HYDROGUI_AISTrihedron.h
+    HYDROGUI_BathymetryPrs.h
     HYDROGUI_CalculationDlg.h
     HYDROGUI_CalculationOp.h
     HYDROGUI_ChannelDlg.h
@@ -11,8 +13,10 @@ set(PROJECT_HEADERS
     HYDROGUI_ColorWidget.h
     HYDROGUI_CopyPasteOp.h
     HYDROGUI_CopyPastePositionOp.h
+    HYDROGUI_CurveCreatorProfile.h
     HYDROGUI_DataBrowser.h
     HYDROGUI_DataModel.h
+    HYDROGUI_DataModelSync.h
     HYDROGUI_DataObject.h
     HYDROGUI_DeleteDlg.h
     HYDROGUI_DeleteOp.h
@@ -21,13 +25,17 @@ set(PROJECT_HEADERS
     HYDROGUI_Displayer.h
     HYDROGUI_ExportImageOp.h
     HYDROGUI_GVSelector.h
+    HYDROGUI_ImagePrs.h
     HYDROGUI_ImmersibleZoneDlg.h
     HYDROGUI_ImmersibleZoneOp.h
     HYDROGUI_ImportBathymetryDlg.h
     HYDROGUI_ImportBathymetryOp.h
     HYDROGUI_ImportImageDlg.h
     HYDROGUI_ImportImageOp.h
+    HYDROGUI_ImportPolylineOp.h
     HYDROGUI_InputPanel.h
+    HYDROGUI_LocalCSDlg.h
+    HYDROGUI_LocalCSOp.h
     HYDROGUI_Module.h
     HYDROGUI_NameValidator.h
     HYDROGUI_ObjSelector.h
@@ -42,6 +50,8 @@ set(PROJECT_HEADERS
     HYDROGUI_PolylineOp.h
     HYDROGUI_ProfileDlg.h
     HYDROGUI_ProfileOp.h
+    HYDROGUI_ProfileInterpolateDlg.h
+    HYDROGUI_ProfileInterpolateOp.h
     HYDROGUI_Prs.h
     HYDROGUI_PrsDriver.h
     HYDROGUI_PrsImage.h
@@ -54,9 +64,13 @@ set(PROJECT_HEADERS
     HYDROGUI_Region.h
     HYDROGUI_RemoveImageRefsOp.h
     HYDROGUI_Shape.h
+    HYDROGUI_Polyline.h
+    HYDROGUI_ShapeBathymetry.h
+    HYDROGUI_ShapeImage.h
     HYDROGUI_ShowHideOp.h
     HYDROGUI_StreamDlg.h
     HYDROGUI_StreamOp.h
+    HYDROGUI_SubmersibleOp.h
     HYDROGUI_Tool.h
     HYDROGUI_TwoImagesDlg.h
     HYDROGUI_TwoImagesOp.h
@@ -83,12 +97,30 @@ set(PROJECT_HEADERS
     HYDROGUI_GeoreferencementOp.h
     HYDROGUI_Actor.h
     HYDROGUI_BathymetryBoundsOp.h
+    HYDROGUI_TranslateObstacleDlg.h
+    HYDROGUI_TranslateObstacleOp.h
+    HYDROGUI_ListModel.h
+    HYDROGUI_ZLevelsDlg.h
+    HYDROGUI_ZLevelsOp.h
+    HYDROGUI_OrderedListWidget.h
+    HYDROGUI_ListSelector.h
+    HYDROGUI_ZLayers.h
+    HYDROGUI_PriorityWidget.h
+    HYDROGUI_PriorityTableModel.h
+    HYDROGUI_RiverBottomDlg.h
+    HYDROGUI_RiverBottomOp.h
+    HYDROGUI_ViewerDlg.h
+    HYDROGUI_ObjComboBox.h
+    HYDROGUI_RecognizeContoursDlg.h
+    HYDROGUI_RecognizeContoursOp.h
 )
 
 QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
 
 set(PROJECT_SOURCES 
     HYDROGUI_AbstractDisplayer.cxx
+    HYDROGUI_AISTrihedron.cxx
+    HYDROGUI_BathymetryPrs.cxx
     HYDROGUI_CalculationDlg.cxx
     HYDROGUI_CalculationOp.cxx
     HYDROGUI_ChannelDlg.cxx
@@ -96,8 +128,10 @@ set(PROJECT_SOURCES
     HYDROGUI_ColorWidget.cxx
     HYDROGUI_CopyPasteOp.cxx
     HYDROGUI_CopyPastePositionOp.cxx
+    HYDROGUI_CurveCreatorProfile.cxx
     HYDROGUI_DataBrowser.cxx
     HYDROGUI_DataModel.cxx
+    HYDROGUI_DataModelSync.cxx
     HYDROGUI_DataObject.cxx
     HYDROGUI_DeleteDlg.cxx
     HYDROGUI_DeleteOp.cxx
@@ -106,13 +140,17 @@ set(PROJECT_SOURCES
     HYDROGUI_Displayer.cxx
     HYDROGUI_ExportImageOp.cxx
     HYDROGUI_GVSelector.cxx
+    HYDROGUI_ImagePrs.cxx
     HYDROGUI_ImmersibleZoneDlg.cxx
     HYDROGUI_ImmersibleZoneOp.cxx
     HYDROGUI_ImportBathymetryDlg.cxx
     HYDROGUI_ImportBathymetryOp.cxx
     HYDROGUI_ImportImageDlg.cxx
     HYDROGUI_ImportImageOp.cxx
+    HYDROGUI_ImportPolylineOp.cxx
     HYDROGUI_InputPanel.cxx
+    HYDROGUI_LocalCSDlg.cxx
+    HYDROGUI_LocalCSOp.cxx
     HYDROGUI_Module.cxx
     HYDROGUI_NameValidator.cxx
     HYDROGUI_ObjSelector.cxx
@@ -127,6 +165,8 @@ set(PROJECT_SOURCES
     HYDROGUI_PolylineOp.cxx
     HYDROGUI_ProfileDlg.cxx
     HYDROGUI_ProfileOp.cxx
+    HYDROGUI_ProfileInterpolateDlg.cxx
+    HYDROGUI_ProfileInterpolateOp.cxx
     HYDROGUI_Prs.cxx
     HYDROGUI_PrsDriver.cxx
     HYDROGUI_PrsImage.cxx
@@ -139,9 +179,13 @@ set(PROJECT_SOURCES
     HYDROGUI_Region.cxx
     HYDROGUI_RemoveImageRefsOp.cxx
     HYDROGUI_Shape.cxx
+    HYDROGUI_Polyline.cxx
+    HYDROGUI_ShapeBathymetry.cxx
+    HYDROGUI_ShapeImage.cxx
     HYDROGUI_ShowHideOp.cxx
     HYDROGUI_StreamDlg.cxx
     HYDROGUI_StreamOp.cxx
+    HYDROGUI_SubmersibleOp.cxx
     HYDROGUI_Tool.cxx
     HYDROGUI_TwoImagesDlg.cxx
     HYDROGUI_TwoImagesOp.cxx
@@ -167,6 +211,24 @@ set(PROJECT_SOURCES
     HYDROGUI_GeoreferencementOp.cxx
     HYDROGUI_Actor.cxx
     HYDROGUI_BathymetryBoundsOp.cxx
+    HYDROGUI_TranslateObstacleDlg.cxx
+    HYDROGUI_TranslateObstacleOp.cxx
+    HYDROGUI_ListModel.cxx
+    HYDROGUI_ZLevelsDlg.cxx
+    HYDROGUI_ZLevelsOp.cxx
+    HYDROGUI_OrderedListWidget.cxx
+    HYDROGUI_ListSelector.cxx
+    HYDROGUI_ZLayers.cxx
+    HYDROGUI_ZLayers2.cxx
+    HYDROGUI_ZLayers3.cxx
+    HYDROGUI_PriorityWidget.cxx
+    HYDROGUI_PriorityTableModel.cxx
+    HYDROGUI_RiverBottomDlg.cxx
+    HYDROGUI_RiverBottomOp.cxx
+    HYDROGUI_ViewerDlg.cxx
+    HYDROGUI_ObjComboBox.cxx
+    HYDROGUI_RecognizeContoursDlg.cxx
+    HYDROGUI_RecognizeContoursOp.cxx
 )
 
 add_definitions(
@@ -189,18 +251,18 @@ include_directories(
   ${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 HYDROCurveCreator
+target_link_libraries(HYDROGUI HYDROData
     ${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}
+    ${GUI_Event} ${GUI_OCCViewer} ${GEOM_GEOM} ${GEOM_GEOMBase} ${GEOM_CurveCreator}
     ${VTK_LIBRARIES} ${SVTK} ${SalomeObject} ${SalomePrs}
     )
+
 INSTALL(TARGETS HYDROGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 set(PROJECT_LIBRARIES HYDROGUI)
@@ -221,3 +283,23 @@ FILE(GLOB GUIXML_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.xml")
 SET(GUI_DATA ${GUIPNG_DATA} ${GUIXML_DATA})
 INSTALL(FILES ${GUI_DATA} DESTINATION ${SALOME_HYDRO_INSTALL_RES_DATA})
 
+# tests
+if(SALOME_BUILD_TESTS)
+
+  set(TEST_HEADERS 
+    test_HYDROGUI_ListModel.h
+  )
+
+  set(TEST_SOURCES 
+    test_HYDROGUI_Main.cxx
+    test_HYDROGUI_ListModel.cxx    
+  )
+  
+  set(TEST_EXE test_HYDROGUI)
+  include(../../CMake/CPPUnitTests.cmake)
+  target_link_libraries(test_HYDROGUI ${CPPUNIT_LIBRARIES} HYDROData HYDROGUI)
+
+  INSTALL(TARGETS test_HYDROGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
+
+endif(SALOME_BUILD_TESTS)
+