Merge branch 'BR_PY3'

[modules/hydro.git] / src / HYDRO_tests / CMakeLists.txt

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 9c940fb6ba63362697c47293bf32a827b7d40626..a9dfb54a6a089c0dd8c1496ef9091fde4e29ddd2 100644 (file)
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -25,9 +25,10 @@ set(PROJECT_HEADERS
   test_HYDROData_Stream.h
   test_HYDROData_Tool.h
   test_HYDROGUI_BathymetryPrs.h
-  
+
   test_Dependencies.h
   test_HYDROData_DTM.h
+  test_HYDROData_BoundaryPolygons.h
   test_GraphicsView.h
   test_Overview.h
 
@@ -52,6 +53,7 @@ set(PROJECT_SOURCES
   test_HYDROData_ShapeFile.cxx
   test_HYDROData_StricklerTable.cxx
   test_HYDROData_DTM.cxx
+  test_HYDROData_BoundaryPolygons.cxx
   test_HYDROGUI_ListModel.cxx
   test_HYDROGUI_Shape.cxx
   test_HYDROGUI_LandCoverMapDlg.cxx
@@ -63,7 +65,7 @@ set(PROJECT_SOURCES
   test_Overview.cxx
   test_HYDROGUI_ProfilesDlg.cxx
   test_HYDROGUI_BathymetryPrs.cxx
- 
+
   TestShape.cxx
   TestViewer.cxx
   TestLib_Listener.cxx
@@ -76,7 +78,7 @@ 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_DIR}/include )
+SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT}/include )
 SET( CAS_INCLUDES $ENV{CASROOT}/inc )
 SET( QT_INCLUDES $ENV{QTDIR}/include $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 )
@@ -85,7 +87,7 @@ SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )
 SET( ECW_INCLUDES $ENV{ECWLIB_ROOT_DIR}/include )
 
 IF( ${WIN32} )
-  link_directories( $ENV{CASROOT}/win64/vc10/lib $ENV{GL2PS_DIR}/lib )
+  link_directories( $ENV{CASROOT}/win64/lib/vc10 $ENV{GL2PS_DIR}/lib )
 ELSE()
   link_directories( $ENV{CASROOT}/lib $ENV{TBB_ROOT_DIR}/lib/intel64/gcc4.4 )
 ENDIF()
@@ -99,7 +101,7 @@ ELSE()
 ENDIF()
 
 
-link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib )
+link_directories( $ENV{CPPUNIT_ROOT}/lib )
 IF( ${WIN32} )
   IF( CMAKE_BUILD_TYPE MATCHES Debug )
     SET( CPPUNIT_LIBRARIES cppunitd )