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

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 47a3e942..1a6f2cf8 100644
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -19,6 +19,10 @@ set(PROJECT_HEADERS
   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
 
@@ -28,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
@@ -46,20 +50,21 @@ set(PROJECT_SOURCES
   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 -D__WIN32__ -D__x86__ -D_WIN64 -D_WIN32_WINNT=0x0400 -D__NT__ -D__OSVERSION__=4
-)
+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( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
@@ -70,15 +75,15 @@ SET( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
 SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )
 
 IF( ${WIN32} )
-  link_directories( $ENV{CASROOT}/win32/libd )
+  link_directories( $ENV{CASROOT}/win64/vc10/lib )
 ELSE()
-  link_directories( $ENV{CASROOT}/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{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()
@@ -92,7 +97,7 @@ ENDIF()
 
 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 GeomUtils )
+SET( GEOM_LIBRARIES CurveCreator GEOMUtils GEOMUtils )
 
 include_directories(
   ${CAS_INCLUDES}
@@ -109,10 +114,6 @@ include_directories(
 source_group( "External files" FILES ${EXTERNAL_FILES} )
 
 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 )
-
-#IF( ${WIN32} )
-#  add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" )
-#ENDIF()
+target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib HYDROData )
 
 INSTALL(TARGETS HYDROData_tests EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})