]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
erreur dans les path pour le link du test CPPUnit (ne marche toujours pas)
authorPaul RASCLE <paul.rascle@edf.fr>
Tue, 28 Mar 2017 06:36:00 +0000 (08:36 +0200)
committerPaul RASCLE <paul.rascle@edf.fr>
Tue, 28 Mar 2017 06:36:00 +0000 (08:36 +0200)
src/HYDRO_tests/CMakeLists.txt

index 639abbb81f51ab010c94f82c83c33a4903b7f272..ae4abb616fe649774b2e4e3213100b9ee11cdf59 100644 (file)
@@ -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()