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

diff --git a/src/HYDROData/CMakeLists.txt b/src/HYDROData/CMakeLists.txt
index fd9899d4..f1868fb7 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
     HYDROData.h
@@ -26,7 +26,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
@@ -43,7 +42,6 @@ set(PROJECT_HEADERS
     HYDROData_Stream.h
     HYDROData_StreamAltitude.h
     HYDROData_StricklerTable.h
-    HYDROData_LandCover.h
     HYDROData_Tool.h
     HYDROData_TopoCurve.h
     HYDROData_Transform.h
@@ -56,6 +54,7 @@ set(PROJECT_HEADERS
     HYDROData_InterpolatorsFactory.h
     HYDROData_SinusX.h
     HYDROData_ShapeFile.h
+    HYDROData_LandCoverMap.h
 )
 
 set(PROJECT_SOURCES 
@@ -83,7 +82,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,7 +98,6 @@ set(PROJECT_SOURCES
     HYDROData_Stream.cxx
     HYDROData_StreamAltitude.cxx
     HYDROData_StricklerTable.cxx
-    HYDROData_LandCover.cxx
     HYDROData_Tool.cxx
     HYDROData_TopoCurve.cxx
     HYDROData_Transform.cxx
@@ -112,6 +109,7 @@ set(PROJECT_SOURCES
     HYDROData_InterpolatorsFactory.cxx
     HYDROData_SinusX.cxx
     HYDROData_ShapeFile.cxx
+    HYDROData_LandCoverMap.cxx
  )
 
 add_definitions(
@@ -127,8 +125,6 @@ add_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
 )
@@ -141,40 +137,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)