From: Paul RASCLE <paul.rascle@edf.fr>
Date: Mon, 7 Dec 2015 13:08:31 +0000 (+0100)
Subject: merge master
X-Git-Tag: SALOME_HYDRO_V1.0~57
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cde2ec476486fcd7c9b7b38ce814c648d73e7fd3;p=modules%2Fhydro.git

merge master
---

cde2ec476486fcd7c9b7b38ce814c648d73e7fd3
diff --cc src/HYDRO_tests/CMakeLists.txt
index 07fa477d,07c05917..35932e15
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@@ -59,10 -59,10 +59,10 @@@ IF( ${WIN32} 
    add_definitions( -DWNT )
  ENDIF()
  
- SET( BOOST_INCLUDES $ENV{BOOST_ROOT}/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( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT}/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( 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 )