X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FCMakeLists.txt;h=9594d54647685a16095efa4d70f07983ea07c9a1;hb=e7e76450be3fadf6ad263f78e10ceb8cd1f70deb;hp=a9773b74873f89931a888f5a8936743328cdccd6;hpb=10a9948d19f358b0ccf850d362d8ad8173b3ea5f;p=modules%2Fhydro.git

diff --git a/src/HYDROData/CMakeLists.txt b/src/HYDROData/CMakeLists.txt
index a9773b74..9594d546 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
@@ -61,6 +61,14 @@ set(PROJECT_HEADERS
     HYDROData_InterpolatorsFactory.h
     HYDROData_SinusX.h
     HYDROData_ShapeFile.h
+    HYDROData_LandCoverMap.h
+    HYDROData_LCM_FaceClassifier.h
+    HYDROData_DTM.h   
+    HYDROData_BCPolygon.h
+    HYDROData_BoundaryPolygonTools.h 
+    HYDROData_CompleteCalcCase.h 
+    HYDROData_StreamLinearInterpolation.h
+    HYDROData_LISM.h
 )
 
 set(PROJECT_SOURCES 
@@ -71,6 +79,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 +97,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 +108,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
@@ -120,8 +128,25 @@ set(PROJECT_SOURCES
     HYDROData_InterpolatorsFactory.cxx
     HYDROData_SinusX.cxx
     HYDROData_ShapeFile.cxx
+    HYDROData_LandCoverMap.cxx
+    HYDROData_LCM_FaceClassifier.cxx
+    HYDROData_DTM.cxx
+    HYDROData_BCPolygon.cxx
+    HYDROData_BoundaryPolygonTools.cxx
+    HYDROData_CompleteCalcCase.cxx
+    HYDROData_StreamLinearInterpolation.cxx
+    HYDROData_LISM.cxx
  )
 
+SET( ECW_INCLUDES $ENV{ECWLIB_ROOT_DIR}/include )
+link_directories( $ENV{ECWLIB_ROOT_DIR}/lib )
+
+IF( ${WIN32} )
+  SET( ECW_LIBRARIES libecwj2 )
+ELSE()
+  SET( ECW_LIBRARIES ecwj2 )
+ENDIF()
+
 add_definitions(
   -DHYDRODATA_EXPORTS
   ${CAS_DEFINITIONS}
@@ -135,54 +160,20 @@ 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
+  ${ECW_INCLUDES}
 )
 
 add_library(HYDROData SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
+set_target_properties( HYDROData PROPERTIES LINK_INTERFACE_LIBRARIES "" )
 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}
-                      ${QT_LIBRARIES} ${GUI_ImageComposer} ${CAS_TKHLR} ${GEOM_GEOM} ${GEOM_GEOMBase} ${GEOM_CurveCreator} )
+                      ${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} ${ECW_LIBRARIES} )
 INSTALL(TARGETS HYDROData EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 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)