X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FCMakeLists.txt;h=e831498a3e37a1eecca2a0d019fa42384b04860d;hb=abdcba0f2ee048bf3c1f6073ef7fea4f0b200dcb;hp=824aa8f2f7a701ea1f4e77284f3dd9b5ecffb7b8;hpb=18bf2fdae8933e8a31ca58f36b6dceb7a4a8cf42;p=modules%2Fhydro.git

diff --git a/src/HYDROData/CMakeLists.txt b/src/HYDROData/CMakeLists.txt
index 824aa8f2..e831498a 100644
--- a/src/HYDROData/CMakeLists.txt
+++ b/src/HYDROData/CMakeLists.txt
@@ -1,4 +1,4 @@
-#include(../../CMake/Common.cmake)
+include(../../CMake/Common.cmake)
 
 set(PROJECT_HEADERS
     HYDRO_trace.hxx
@@ -10,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
@@ -27,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
@@ -39,13 +39,13 @@ 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
@@ -60,7 +60,10 @@ set(PROJECT_HEADERS
     HYDROData_LinearInterpolator.h
     HYDROData_InterpolatorsFactory.h
     HYDROData_SinusX.h
-    shapelib/shapefil.h
+    HYDROData_ShapeFile.h
+    HYDROData_LandCoverMap.h
+    HYDROData_LCM_FaceClassifier.h
+    HYDROData_DTM.h   
 )
 
 set(PROJECT_SOURCES 
@@ -71,6 +74,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
@@ -88,7 +92,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
@@ -100,13 +103,13 @@ 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
@@ -119,12 +122,11 @@ set(PROJECT_SOURCES
     HYDROData_LinearInterpolator.cxx
     HYDROData_InterpolatorsFactory.cxx
     HYDROData_SinusX.cxx
-    shapelib/dbfopen.c
-    shapelib/safileio.c
-    shapelib/shpopen.c
-    shapelib/shptree.c
-    shapelib/shputils.c
-)
+    HYDROData_ShapeFile.cxx
+    HYDROData_LandCoverMap.cxx
+    HYDROData_LCM_FaceClassifier.cxx
+    HYDROData_DTM.cxx
+ )
 
 add_definitions(
   -DHYDRODATA_EXPORTS
@@ -139,53 +141,18 @@ add_definitions(
 include_directories(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-#  ${GUI_ROOT_DIR}/include/salome
+  ${VTK_INCLUDE_DIRS}
+  ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
 )
 
 add_library(HYDROData SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-target_link_libraries(HYDROData ${GEOM_GEOMUtils} ${CAS_OCAF} ${CAS_OCAFVIS} ${CAS_TKG3d} ${CAS_TKGeomBase} ${CAS_TKGeomAlgo}
-                      ${CAS_TKBrep} ${CAS_TKIGES} ${CAS_TKSTEP} ${CAS_TKTopAlgo} ${CAS_TKBO} ${CAS_TKBool} ${CAS_TKOffset}
+target_link_libraries(HYDROData shapelib ${GEOM_GEOMUtils} ${CAS_OCAF} ${CAS_OCAFVIS} ${CAS_TKG3d} ${CAS_TKGeomBase} ${CAS_TKGeomAlgo}
+                      ${CAS_TKBrep} ${CAS_TKIGES} ${CAS_TKSTEP} ${CAS_TKTopAlgo} ${CAS_TKBO} ${CAS_TKBool} ${CAS_TKOffset} ${VTK_LIBRARIES}
                       ${QT_LIBRARIES} ${GUI_ImageComposer} ${CAS_TKHLR} ${GEOM_GEOM} ${GEOM_GEOMBase} ${GEOM_CurveCreator} )
 INSTALL(TARGETS HYDROData EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-set(PROJECT_LIBRARIES 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)
+set(PROJECT_LIBRARIES shapelib HYDROData)
 
 #include(../../CMake/CommonInstall.cmake)