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

diff --git a/src/HYDROData/CMakeLists.txt b/src/HYDROData/CMakeLists.txt
index 30d7e986..63ee232d 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
@@ -24,6 +24,7 @@ set(PROJECT_HEADERS
     HYDROData_Obstacle.h
     HYDROData_OperationsFactory.h
     HYDROData_Polyline.h
+    HYDROData_PolylineXY.h
     HYDROData_Profile.h
     HYDROData_ProfileUZ.h
     HYDROData_Region.h
@@ -58,6 +59,7 @@ set(PROJECT_SOURCES
     HYDROData_Obstacle.cxx
     HYDROData_OperationsFactory.cxx
     HYDROData_Polyline.cxx
+    HYDROData_PolylineXY.cxx
     HYDROData_Profile.cxx
     HYDROData_ProfileUZ.cxx
     HYDROData_Region.cxx
@@ -73,23 +75,26 @@ add_definitions(
   -DHYDRODATA_EXPORTS
   ${CAS_DEFINITIONS}
   ${QT_DEFINITIONS}
-  ${GUI_CXXFLAGS}
+#  ${GUI_CXXFLAGS}
+  ${GUI_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} ${CAS_TKBO} ${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} ${QT_LIBRARIES} ${GUI_ImageComposer})
+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
@@ -101,7 +106,6 @@ if(CPPUNIT_IS_OK)
     test_HYDROData_Iterator.h
     test_HYDROData_OperationsFactory.h
     test_HYDROData_Polyline.h
-    test_HYDROData_Profile.h
   )
 
   set(TEST_SOURCES 
@@ -115,13 +119,12 @@ if(CPPUNIT_IS_OK)
     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)
+  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)