X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FCMakeLists.txt;h=1a6f2cf8a01490268f91962bcb3852a42fe45a93;hb=4e3040ddfcb6e24198d1dab909eb59b94d34b437;hp=4762aafb443efcb21e33a14e25853f9d45b0e97d;hpb=9befc66f671bd8035cd0127f54e1b3e631d1c1d2;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 4762aafb..1a6f2cf8 100644
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -1,3 +1,5 @@
+ADD_SUBDIRECTORY(reference_data)
+
 include(../../CMake/Common.cmake)
 include(ExternalFiles.cmake)
 
@@ -16,7 +18,13 @@ set(PROJECT_HEADERS
   test_HYDROData_StricklerTable.h
   test_HYDROGUI_ListModel.h
   test_HYDROGUI_Shape.h
+  test_HYDROGUI_LandCoverMapDlg.h
+  test_HYDROData_CalcCase.h
+  test_HYDROData_Stream.h
+  test_HYDROData_Tool.h
+  
   test_Dependencies.h
+  test_HYDROData_DTM.h
 
   TestShape.h
   TestViewer.h
@@ -24,7 +32,7 @@ set(PROJECT_HEADERS
   TestLib_Runner.h
 )
 
-set(PROJECT_SOURCES 
+set(PROJECT_SOURCES
   test_HYDROData_Bathymetry.cxx
   test_HYDROData_Channel.cxx
   test_HYDROData_Document.cxx
@@ -38,41 +46,44 @@ set(PROJECT_SOURCES
   test_HYDROData_Profile.cxx
   test_HYDROData_ShapeFile.cxx
   test_HYDROData_StricklerTable.cxx
+  test_HYDROData_DTM.cxx
   test_HYDROGUI_ListModel.cxx
   test_HYDROGUI_Shape.cxx
+  test_HYDROGUI_LandCoverMapDlg.cxx
+  test_HYDROData_CalcCase.cxx
+  test_HYDROData_Stream.cxx
   test_Dependencies.cxx
-
+  test_HYDROData_Tool.cxx
+ 
   TestShape.cxx
   TestViewer.cxx
   TestLib_Listener.cxx
   TestLib_Runner.cxx
 )
 
-add_definitions(
-  -DLIGHT_MODE -DHYDRODATA_STATIC -DHYDROGUI_STATIC
-)
+add_definitions( -DLIGHT_MODE -DHYDRODATA_STATIC -DHYDROGUI_STATIC )
 
 IF( ${WIN32} )
-  add_definitions( -DWNT )
+  add_definitions( -DWNT -D__WIN32__ -D__x86__ -D_WIN64 -D_WIN32_WINNT=0x0400 -D__NT__ -D__OSVERSION__=4 )
 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 $ENV{QT4_ROOT_DIR}/include/QtTest )
+SET( CAS_INCLUDES $ENV{CASROOT}/inc )
+SET( QT_INCLUDES $ENV{QT_ROOT_DIR}/include $ENV{QT_ROOT_DIR}/include/QtCore $ENV{QT_ROOT_DIR}/include/QtGui $ENV{QT_ROOT_DIR}/include/QtTest )
+SET( KERNEL_INCLUDES $ENV{KERNEL_ROOT_DIR}/include/salome )
 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 )
+  link_directories( $ENV{CASROOT}/win64/vc10/lib )
 ELSE()
-  link_directories( $ENV{CAS_ROOT_DIR}/lib )
+  link_directories( $ENV{CASROOT}/lib $ENV{TBB_ROOT_DIR}/lib/intel64/gcc4.4 )
 ENDIF()
 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 )
+link_directories( $ENV{QT_ROOT_DIR}/lib )
 IF( ${WIN32} )
-  SET( QT_LIBRARIES QtCored4 QtGuid4 QtTestd4 )
+  SET( QT_LIBRARIES Qt5Cored Qt5Guid Qt5Testd )
 ELSE()
   SET( QT_LIBRARIES QtCore QtGui QtTest )
 ENDIF()
@@ -84,15 +95,15 @@ ELSE()
   SET( CPPUNIT_LIBRARIES cppunit )
 ENDIF()
 
-link_directories( $ENV{GUI_ROOT_DIR}/lib/salome $ENV{GEOM_ROOT_DIR}/lib/salome )
+link_directories( $ENV{KERNEL_ROOT_DIR}/lib/salome $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 )
+SET( GEOM_LIBRARIES CurveCreator GEOMUtils GEOMUtils )
 
 include_directories(
-  ${BOOST_INCLUDES}
   ${CAS_INCLUDES}
   ${QT_INCLUDES}
   ${CPPUNIT_INCLUDES}
+  ${KERNEL_INCLUDES}
   ${GUI_INCLUDES}
   ${GEOM_INCLUDES}
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
@@ -102,9 +113,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} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib )
+add_executable( HYDROData_tests ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${EXTERNAL_FILES} ${PROJECT_MOC_HEADERS} )
+target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib HYDROData )
 
-IF( ${WIN32} )
-  add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" )
-ENDIF()
+INSTALL(TARGETS HYDROData_tests EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})