X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FCMakeLists.txt;h=3c68334a6d0e5b312b8baabf8c027756ad183476;hb=ac056ee3c8e228f5b79eca9bad0fec624c595b1b;hp=7ee642314746303082cf46b5ffcda615fb0730ca;hpb=79f36794a3fca3f17a068f5756fb43b3c9ca2c1b;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 7ee64231..3c68334a 100644
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -21,9 +21,13 @@ set(PROJECT_HEADERS
   test_HYDROGUI_LandCoverMapDlg.h
   test_HYDROData_CalcCase.h
   test_HYDROData_Stream.h
-
+  test_HYDROData_Tool.h
+  test_HYDROGUI_BathymetryPrs.h
+  
   test_Dependencies.h
   test_HYDROData_DTM.h
+  test_GraphicsView.h
+  test_Overview.h
 
   TestShape.h
   TestViewer.h
@@ -52,43 +56,55 @@ set(PROJECT_SOURCES
   test_HYDROData_CalcCase.cxx
   test_HYDROData_Stream.cxx
   test_Dependencies.cxx
-
+  test_HYDROData_Tool.cxx
+  test_GraphicsView.cxx
+  test_Overview.cxx
+  test_HYDROGUI_BathymetryPrs.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 -DTEST_MODE )
 
 IF( ${WIN32} )
   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}/include )
+SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
 SET( CAS_INCLUDES $ENV{CASROOT}/inc )
-SET( QT_INCLUDES $ENV{QTDIR}/include $ENV{QTDIR}/include/QtCore $ENV{QTDIR}/include/QtGui $ENV{QTDIR}/include/QtTest )
+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{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{QTDIR}/lib )
+link_directories( $ENV{QT_ROOT_DIR}/lib )
 IF( ${WIN32} )
-  SET( QT_LIBRARIES QtCored4 QtGuid4 QtTestd4 )
+  IF( CMAKE_BUILD_TYPE MATCHES Debug )
+    SET( QT_LIBRARIES Qt5Cored Qt5Guid Qt5Testd )
+  ELSE()
+    SET( QT_LIBRARIES Qt5Core Qt5Gui Qt5Test )
+  ENDIF()
 ELSE()
   SET( QT_LIBRARIES QtCore QtGui QtTest )
 ENDIF()
 
-link_directories( $ENV{CPPUNIT_ROOT}/lib )
+link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib )
 IF( ${WIN32} )
-  SET( CPPUNIT_LIBRARIES cppunitd )
+  IF( CMAKE_BUILD_TYPE MATCHES Debug )
+    SET( CPPUNIT_LIBRARIES cppunitd )
+  ELSE()
+    SET( CPPUNIT_LIBRARIES cppunit )
+  ENDIF()
 ELSE()
   SET( CPPUNIT_LIBRARIES cppunit )
 ENDIF()