X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FCMakeLists.txt;h=f1868fb7d8d22e2c8b9d78a595a768f3446e6e1c;hb=545854182f0363f61284d5abe34c3627d4f3b088;hp=30d7e9869229573dfdb2c667a9a4dc21e89b24fa;hpb=8749815cc2069167555bf5e823190727b7004a35;p=modules%2Fhydro.git

diff --git a/src/HYDROData/CMakeLists.txt b/src/HYDROData/CMakeLists.txt
index 30d7e986..f1868fb7 100644
--- a/src/HYDROData/CMakeLists.txt
+++ b/src/HYDROData/CMakeLists.txt
@@ -12,8 +12,10 @@ set(PROJECT_HEADERS
     HYDROData_Confluence.h
     HYDROData_Digue.h
     HYDROData_Document.h
+    HYDROData_DummyObject3D.h
     HYDROData_Entity.h
     HYDROData_IAltitudeObject.h
+    HYDROData_IInterpolator.h
     HYDROData_Image.h
     HYDROData_ImmersibleZone.h
     HYDROData_IPolyline.h
@@ -22,17 +24,37 @@ set(PROJECT_HEADERS
     HYDROData_NaturalObject.h
     HYDROData_Object.h
     HYDROData_Obstacle.h
+    HYDROData_ObstacleAltitude.h
     HYDROData_OperationsFactory.h
-    HYDROData_Polyline.h
+    HYDROData_PolylineOperator.h
+    HYDROData_PolylineXY.h
+    HYDROData_Polyline3D.h
+    HYDROData_PriorityQueue.h
     HYDROData_Profile.h
     HYDROData_ProfileUZ.h
+    HYDROData_Projection.h
     HYDROData_Region.h
     HYDROData_River.h
+    HYDROData_ShapesGroup.h
+    HYDROData_ShapesTool.h
+    HYDROData_SplittedShapesGroup.h
     HYDROData_SplitToZonesTool.h
     HYDROData_Stream.h
+    HYDROData_StreamAltitude.h
+    HYDROData_StricklerTable.h
     HYDROData_Tool.h
+    HYDROData_TopoCurve.h
+    HYDROData_Transform.h
     HYDROData_VisualState.h
+    HYDROData_Warning.h
     HYDROData_Zone.h
+    HYDROData_GeomTool.h
+    HYDROData_IProfilesInterpolator.h
+    HYDROData_LinearInterpolator.h
+    HYDROData_InterpolatorsFactory.h
+    HYDROData_SinusX.h
+    HYDROData_ShapeFile.h
+    HYDROData_LandCoverMap.h
 )
 
 set(PROJECT_SOURCES 
@@ -46,8 +68,10 @@ set(PROJECT_SOURCES
     HYDROData_Confluence.cxx
     HYDROData_Digue.cxx
     HYDROData_Document.cxx
+    HYDROData_DummyObject3D.cxx
     HYDROData_Entity.cxx
     HYDROData_IAltitudeObject.cxx
+    HYDROData_IInterpolator.cxx
     HYDROData_Image.cxx
     HYDROData_ImmersibleZone.cxx
     HYDROData_IPolyline.cxx
@@ -56,72 +80,61 @@ set(PROJECT_SOURCES
     HYDROData_NaturalObject.cxx
     HYDROData_Object.cxx
     HYDROData_Obstacle.cxx
+    HYDROData_ObstacleAltitude.cxx
     HYDROData_OperationsFactory.cxx
-    HYDROData_Polyline.cxx
+    HYDROData_PolylineOperator.cxx
+    HYDROData_PolylineXY.cxx
+    HYDROData_Polyline3D.cxx
+    HYDROData_PriorityQueue.cxx
     HYDROData_Profile.cxx
     HYDROData_ProfileUZ.cxx
+    HYDROData_Projection.cxx
     HYDROData_Region.cxx
     HYDROData_River.cxx
+    HYDROData_ShapesGroup.cxx
+    HYDROData_ShapesTool.cxx
+    HYDROData_SplittedShapesGroup.cxx
     HYDROData_SplitToZonesTool.cxx
     HYDROData_Stream.cxx
+    HYDROData_StreamAltitude.cxx
+    HYDROData_StricklerTable.cxx
     HYDROData_Tool.cxx
+    HYDROData_TopoCurve.cxx
+    HYDROData_Transform.cxx
     HYDROData_VisualState.cxx
     HYDROData_Zone.cxx
-)
+    HYDROData_GeomTool.cxx
+    HYDROData_IProfilesInterpolator.cxx
+    HYDROData_LinearInterpolator.cxx
+    HYDROData_InterpolatorsFactory.cxx
+    HYDROData_SinusX.cxx
+    HYDROData_ShapeFile.cxx
+    HYDROData_LandCoverMap.cxx
+ )
 
 add_definitions(
   -DHYDRODATA_EXPORTS
   ${CAS_DEFINITIONS}
+  ${OMNIORB_DEFINITIONS}
   ${QT_DEFINITIONS}
-  ${GUI_CXXFLAGS}
+#  ${GUI_CXXFLAGS}
+  ${GUI_DEFINITIONS}
+  ${GEOM_DEFINITIONS}
 )
 
 include_directories(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${GUI_ROOT_DIR}/include/salome
+  ${GUI_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
 )
 
 add_library(HYDROData SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-target_link_libraries(HYDROData ${CAS_OCAF} ${CAS_OCAFVIS} ${CAS_TKG3d} ${CAS_TKGeomBase} ${CAS_TKGeomAlgo} ${CAS_TKBrep} ${CAS_TKTopAlgo} ${CAS_TKBO} ${QT_LIBRARIES} ${ImageComposer})
-
-set(PROJECT_LIBRARIES HYDROData)
-
-# tests
-if(CPPUNIT_IS_OK)
-
-  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_Polyline.h
-    test_HYDROData_Profile.h
-  )
+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} )
+INSTALL(TARGETS HYDROData EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-  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_Polyline.cxx
-    test_HYDROData_Profile.cxx
-  )
-  
-  set(TEST_EXE test_HYDROData)
-  include(../../CMake/CPPUnitTests.cmake)
-  target_link_libraries(test_HYDROData ${CAS_OCAF} ${CAS_MODELER} ${QT_LIBRARIES} ${CPPUNIT_LIBS} HYDROData)
-  
-endif(CPPUNIT_IS_OK)
+set(PROJECT_LIBRARIES shapelib HYDROData)
 
-include(../../CMake/CommonInstall.cmake)
+#include(../../CMake/CommonInstall.cmake)