From: Paul RASCLE <paul.rascle@edf.fr>
Date: Tue, 28 Mar 2017 06:36:00 +0000 (+0200)
Subject: erreur dans les path pour le link du test CPPUnit (ne marche toujours pas)
X-Git-Tag: Salome_8_3_Hydro_1_1rc1~55
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bcf3de1cb297ef7e1cfc1bfd99ca5a2b61b31458;p=modules%2Fhydro.git

erreur dans les path pour le link du test CPPUnit (ne marche toujours pas)
---

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 639abbb8..ae4abb61 100644
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -69,7 +69,7 @@ ENDIF()
 
 SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT}/include )
 SET( CAS_INCLUDES $ENV{CASROOT}/inc )
-SET( QT_INCLUDES $ENV{QT5_ROOT_DIR}/include $ENV{QT5_ROOT_DIR}/include/QtCore $ENV{QT5_ROOT_DIR}/include/QtGui $ENV{QT5_ROOT_DIR}/include/QtTest )
+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 )
@@ -81,7 +81,7 @@ ELSE()
 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{QT5_ROOT_DIR}/lib )
+link_directories( $ENV{QTDIR}/lib )
 IF( ${WIN32} )
   SET( QT_LIBRARIES QtCored4 QtGuid4 QtTestd4 )
 ELSE()