merge master

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

diff --git a/src/HYDROData/CMakeLists.txt b/src/HYDROData/CMakeLists.txt
index fd9899d428291a90221b1dbe83b150ef2d6c409a..d6689d13d24665ad5cfc4fb7f0c04c6b761fc3f1 100644 (file)
--- a/src/HYDROData/CMakeLists.txt
+++ b/src/HYDROData/CMakeLists.txt
@@ -1,6 +1,7 @@
-#include(../../CMake/Common.cmake)
+include(../../CMake/Common.cmake)
 
 set(PROJECT_HEADERS
+    HYDRO_trace.hxx
     HYDROData.h
     HYDROData_AltitudeObject.h
     HYDROData_Application.h
@@ -9,6 +10,7 @@ set(PROJECT_HEADERS
     HYDROData_BSplineOperation.h
     HYDROData_CalculationCase.h
     HYDROData_Channel.h
+    HYDROData_ChannelAltitude.h
     HYDROData_Confluence.h
     HYDROData_Digue.h
     HYDROData_Document.h
@@ -26,7 +28,6 @@ set(PROJECT_HEADERS
     HYDROData_Obstacle.h
     HYDROData_ObstacleAltitude.h
     HYDROData_OperationsFactory.h
-    HYDROData_Pipes.h
     HYDROData_PolylineOperator.h
     HYDROData_PolylineXY.h
     HYDROData_Polyline3D.h
@@ -38,24 +39,29 @@ set(PROJECT_HEADERS
     HYDROData_River.h
     HYDROData_ShapesGroup.h
     HYDROData_ShapesTool.h
-    HYDROData_SplittedShapesGroup.h
+    HYDROData_SplitShapesGroup.h
     HYDROData_SplitToZonesTool.h
     HYDROData_Stream.h
     HYDROData_StreamAltitude.h
     HYDROData_StricklerTable.h
-    HYDROData_LandCover.h
     HYDROData_Tool.h
     HYDROData_TopoCurve.h
     HYDROData_Transform.h
     HYDROData_VisualState.h
     HYDROData_Warning.h
     HYDROData_Zone.h
+    HYDROData_Tree.hxx
+    HYDROData_Quadtree.hxx
+    HYDROData_QuadtreeNode.hxx
+    HYDROData_Octree.hxx
+    HYDROData_OctreeNode.hxx
     HYDROData_GeomTool.h
     HYDROData_IProfilesInterpolator.h
     HYDROData_LinearInterpolator.h
     HYDROData_InterpolatorsFactory.h
     HYDROData_SinusX.h
     HYDROData_ShapeFile.h
+    HYDROData_LandCoverMap.h
 )
 
 set(PROJECT_SOURCES 
@@ -66,6 +72,7 @@ set(PROJECT_SOURCES
     HYDROData_BSplineOperation.cxx
     HYDROData_CalculationCase.cxx
     HYDROData_Channel.cxx
+    HYDROData_ChannelAltitude.cxx
     HYDROData_Confluence.cxx
     HYDROData_Digue.cxx
     HYDROData_Document.cxx
@@ -83,7 +90,6 @@ set(PROJECT_SOURCES
     HYDROData_Obstacle.cxx
     HYDROData_ObstacleAltitude.cxx
     HYDROData_OperationsFactory.cxx
-    HYDROData_Pipes.cxx
     HYDROData_PolylineOperator.cxx
     HYDROData_PolylineXY.cxx
     HYDROData_Polyline3D.cxx
@@ -95,23 +101,27 @@ set(PROJECT_SOURCES
     HYDROData_River.cxx
     HYDROData_ShapesGroup.cxx
     HYDROData_ShapesTool.cxx
-    HYDROData_SplittedShapesGroup.cxx
+    HYDROData_SplitShapesGroup.cxx
     HYDROData_SplitToZonesTool.cxx
     HYDROData_Stream.cxx
     HYDROData_StreamAltitude.cxx
     HYDROData_StricklerTable.cxx
-    HYDROData_LandCover.cxx
     HYDROData_Tool.cxx
     HYDROData_TopoCurve.cxx
     HYDROData_Transform.cxx
     HYDROData_VisualState.cxx
     HYDROData_Zone.cxx
+    HYDROData_Quadtree.cxx
+    HYDROData_QuadtreeNode.cxx
+    HYDROData_Octree.cxx
+    HYDROData_OctreeNode.cxx
     HYDROData_GeomTool.cxx
     HYDROData_IProfilesInterpolator.cxx
     HYDROData_LinearInterpolator.cxx
     HYDROData_InterpolatorsFactory.cxx
     HYDROData_SinusX.cxx
     HYDROData_ShapeFile.cxx
+    HYDROData_LandCoverMap.cxx
  )
 
 add_definitions(
@@ -127,8 +137,7 @@ add_definitions(
 include_directories(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-#  ${GUI_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
 )
@@ -141,40 +150,4 @@ INSTALL(TARGETS HYDROData EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME
 
 set(PROJECT_LIBRARIES shapelib HYDROData)
 
-# tests
-if(SALOME_BUILD_TESTS)
-
-  set(TEST_HEADERS 
-    test_HYDROData_Bathymetry.h
-    test_HYDROData_BSplineOperation.h
-    test_HYDROData_CalculationCase.h
-    test_HYDROData_Document.h
-    test_HYDROData_Entity.h
-    test_HYDROData_Image.h
-    test_HYDROData_Iterator.h
-    test_HYDROData_OperationsFactory.h
-    test_HYDROData_PolylineXY.h
-    test_HYDROData_StricklerTable.h
-  )
-
-  set(TEST_SOURCES 
-    test_HYDROData_Main.cxx
-    test_HYDROData_Bathymetry.cxx
-    test_HYDROData_BSplineOperation.cxx
-    test_HYDROData_CalculationCase.cxx
-    test_HYDROData_Document.cxx
-    test_HYDROData_Entity.cxx
-    test_HYDROData_Image.cxx
-    test_HYDROData_Iterator.cxx
-    test_HYDROData_OperationsFactory.cxx
-    test_HYDROData_PolylineXY.cxx
-    test_HYDROData_StricklerTable.cxx
-  )
-  
-  set(TEST_EXE test_HYDROData)
-  include(../../CMake/CPPUnitTests.cmake)
-  target_link_libraries(test_HYDROData ${CAS_OCAF} ${CAS_MODELER} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} HYDROData)
-
-endif(SALOME_BUILD_TESTS)
-
 #include(../../CMake/CommonInstall.cmake)