X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FCMakeLists.txt;h=167285a9af7792c73996734f3b7a67d797a8a323;hb=9c947f35615e69e9e54a8c4b074dd1f2be13689c;hp=f94e0e2cfce9b5d3a4f59fda2a54555886fb98c0;hpb=fdfbecc502e984321f7e660d64e6031df35e26c2;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index f94e0e2c..167285a9 100644
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -3,6 +3,7 @@ include(ExternalFiles.cmake)
 
 set(PROJECT_HEADERS
   test_HYDROData_Bathymetry.h
+  test_HYDROData_Channel.h
   test_HYDROData_Document.h
   test_HYDROData_Entity.h
   test_HYDROData_Image.h
@@ -16,14 +17,15 @@ set(PROJECT_HEADERS
   test_HYDROGUI_ListModel.h
   test_Dependencies.h
 
+  TestShape.h
   TestViewer.h
   TestLib_Listener.h
   TestLib_Runner.h
-  random.h
 )
 
 set(PROJECT_SOURCES 
   test_HYDROData_Bathymetry.cxx
+  test_HYDROData_Channel.cxx
   test_HYDROData_Document.cxx
   test_HYDROData_Entity.cxx
   test_HYDROData_Image.cxx
@@ -38,10 +40,10 @@ set(PROJECT_SOURCES
   test_HYDROGUI_ListModel.cxx
   test_Dependencies.cxx
 
+  TestShape.cxx
   TestViewer.cxx
   TestLib_Listener.cxx
   TestLib_Runner.cxx
-  random.cxx
 )
 
 add_definitions(
@@ -55,21 +57,22 @@ ENDIF()
 SET( BOOST_INCLUDES $ENV{BOOST_ROOT_DIR}/include/boost-1_52 )
 SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
 SET( CAS_INCLUDES $ENV{CAS_ROOT_DIR}/inc )
-SET( QT_INCLUDES $ENV{QT4_ROOT_DIR}/include $ENV{QT4_ROOT_DIR}/include/QtCore $ENV{QT4_ROOT_DIR}/include/QtGui )
+SET( QT_INCLUDES $ENV{QT4_ROOT_DIR}/include $ENV{QT4_ROOT_DIR}/include/QtCore $ENV{QT4_ROOT_DIR}/include/QtGui $ENV{QT4_ROOT_DIR}/include/QtTest )
 SET( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
+SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )
 
 IF( ${WIN32} )
   link_directories( $ENV{CAS_ROOT_DIR}/win32/libd )
 ELSE()
   link_directories( $ENV{CAS_ROOT_DIR}/lib )
 ENDIF()
-SET( CAS_LIBRARIES TKernel TKLCAF TKCAF TKCDF TKMath TKG2d TKG3d TKBRep TKGeomBase TKTopAlgo TKGeomAlgo TKBool TKShHealing TKXSBase TKOffset TKHLR TKBO TKV3d )
+SET( CAS_LIBRARIES TKernel TKLCAF TKCAF TKCDF TKMath TKG2d TKG3d TKBRep TKGeomBase TKTopAlgo TKGeomAlgo TKBool TKShHealing TKXSBase TKOffset TKHLR TKBO TKV3d TKService TKMesh )
 
 link_directories( $ENV{QT4_ROOT_DIR}/lib )
 IF( ${WIN32} )
-  SET( QT_LIBRARIES QtCored4 QtGuid4 )
+  SET( QT_LIBRARIES QtCored4 QtGuid4 QtTestd4 )
 ELSE()
-  SET( QT_LIBRARIES QtCore QtGui )
+  SET( QT_LIBRARIES QtCore QtGui QtTest )
 ENDIF()
 
 link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib )
@@ -79,15 +82,17 @@ ELSE()
   SET( CPPUNIT_LIBRARIES cppunit )
 ENDIF()
 
-link_directories( $ENV{GUI_ROOT_DIR}/lib/salome )
+link_directories( $ENV{GUI_ROOT_DIR}/lib/salome $ENV{GEOM_ROOT_DIR}/lib/salome )
 SET( GUI_LIBRARIES ImageComposer qtx suit LightApp CAM OCCViewer )
+SET( GEOM_LIBRARIES CurveCreator )
 
 include_directories(
   ${BOOST_INCLUDES}
-  ${CAS_INCLUDE_DIRS}
+  ${CAS_INCLUDES}
   ${QT_INCLUDES}
   ${CPPUNIT_INCLUDES}
   ${GUI_INCLUDES}
+  ${GEOM_INCLUDES}
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROGUI
   ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
@@ -96,7 +101,7 @@ include_directories(
 source_group( "External files" FILES ${EXTERNAL_FILES} )
 
 add_executable( HYDROData_tests ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${EXTERNAL_FILES} )
-target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib )
+target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib )
 
 IF( ${WIN32} )
   add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" )