X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FCMakeLists.txt;h=4ef25b8b9f1d86e8e9fa56078bb8b723b7c181ab;hb=4ef4f1809f4602d520ddfe0f8c82630cbc2fda2f;hp=71fc6191f63dfbafecab902c9311926f9eae274e;hpb=d40286a203c60a8a099b2ac92e6e88a449b2c1c2;p=modules%2Fhydro.git

diff --git a/src/HYDROData/CMakeLists.txt b/src/HYDROData/CMakeLists.txt
index 71fc6191..4ef25b8b 100644
--- a/src/HYDROData/CMakeLists.txt
+++ b/src/HYDROData/CMakeLists.txt
@@ -1,47 +1,87 @@
-include(../../CMake/Common.cmake)
+#include(../../CMake/Common.cmake)
 
 set(PROJECT_HEADERS
     HYDROData.h
+    HYDROData_AltitudeObject.h
     HYDROData_Application.h
     HYDROData_ArtificialObject.h
     HYDROData_Bathymetry.h
     HYDROData_BSplineOperation.h
-    HYDROData_Calculation.h
+    HYDROData_CalculationCase.h
+    HYDROData_Channel.h
+    HYDROData_Confluence.h
+    HYDROData_Digue.h
     HYDROData_Document.h
+    HYDROData_DummyObject3D.h
     HYDROData_Entity.h
+    HYDROData_IAltitudeObject.h
     HYDROData_Image.h
     HYDROData_ImmersibleZone.h
+    HYDROData_IPolyline.h
     HYDROData_Iterator.h
     HYDROData_Lambert93.h
     HYDROData_NaturalObject.h
     HYDROData_Object.h
+    HYDROData_Obstacle.h
+    HYDROData_ObstacleAltitude.h
     HYDROData_OperationsFactory.h
-    HYDROData_Polyline.h
+    HYDROData_Pipes.h
+    HYDROData_PolylineXY.h
+    HYDROData_Polyline3D.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_Tool.h
     HYDROData_VisualState.h
     HYDROData_Zone.h
 )
 
 set(PROJECT_SOURCES 
+    HYDROData_AltitudeObject.cxx
     HYDROData_Application.cxx
     HYDROData_ArtificialObject.cxx
     HYDROData_Bathymetry.cxx
     HYDROData_BSplineOperation.cxx
-    HYDROData_Calculation.cxx
+    HYDROData_CalculationCase.cxx
+    HYDROData_Channel.cxx
+    HYDROData_Confluence.cxx
+    HYDROData_Digue.cxx
     HYDROData_Document.cxx
+    HYDROData_DummyObject3D.cxx
     HYDROData_Entity.cxx
+    HYDROData_IAltitudeObject.cxx
     HYDROData_Image.cxx
     HYDROData_ImmersibleZone.cxx
+    HYDROData_IPolyline.cxx
     HYDROData_Iterator.cxx
     HYDROData_Lambert93.cxx
     HYDROData_NaturalObject.cxx
     HYDROData_Object.cxx
+    HYDROData_Obstacle.cxx
+    HYDROData_ObstacleAltitude.cxx
     HYDROData_OperationsFactory.cxx
-    HYDROData_Polyline.cxx
+    HYDROData_Pipes.cxx
+    HYDROData_PolylineXY.cxx
+    HYDROData_Polyline3D.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_Tool.cxx
     HYDROData_VisualState.cxx
     HYDROData_Zone.cxx
@@ -50,54 +90,61 @@ set(PROJECT_SOURCES
 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_ROOT_DIR}/include/salome
+  ${GUI_INCLUDE_DIRS}
 )
 
 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} ${QT_LIBRARIES} ${ImageComposer})
+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}
+                      ${QT_LIBRARIES} ${GUI_ImageComposer} ${CAS_TKHLR} ${GEOM_GEOM} ${GEOM_GEOMBase} )
+INSTALL(TARGETS HYDROData EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 set(PROJECT_LIBRARIES HYDROData)
 
 # tests
-if(CPPUNIT_IS_OK)
+if(SALOME_BUILD_TESTS)
 
   set(TEST_HEADERS 
     test_HYDROData_Bathymetry.h
     test_HYDROData_BSplineOperation.h
-    test_HYDROData_Calculation.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_PolylineXY.h
   )
 
   set(TEST_SOURCES 
     test_HYDROData_Main.cxx
     test_HYDROData_Bathymetry.cxx
     test_HYDROData_BSplineOperation.cxx
-    test_HYDROData_Calculation.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_PolylineXY.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)
+  target_link_libraries(test_HYDROData ${CAS_OCAF} ${CAS_MODELER} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} HYDROData)
+
+endif(SALOME_BUILD_TESTS)
 
-include(../../CMake/CommonInstall.cmake)
+#include(../../CMake/CommonInstall.cmake)