X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDRO_tests%2FCMakeLists.txt;h=ae4abb616fe649774b2e4e3213100b9ee11cdf59;hb=bcf3de1cb297ef7e1cfc1bfd99ca5a2b61b31458;hp=041a55d0ca385349fb5b6495a50d57e3470e632d;hpb=b1a82c5ece18a663b8b601e209a45b1fa256722c;p=modules%2Fhydro.git diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt index 041a55d0..ae4abb61 100644 --- a/src/HYDRO_tests/CMakeLists.txt +++ b/src/HYDRO_tests/CMakeLists.txt @@ -21,7 +21,8 @@ set(PROJECT_HEADERS test_HYDROGUI_LandCoverMapDlg.h test_HYDROData_CalcCase.h test_HYDROData_Stream.h - + test_HYDROData_Tool.h + test_Dependencies.h test_HYDROData_DTM.h @@ -52,7 +53,8 @@ set(PROJECT_SOURCES test_HYDROData_CalcCase.cxx test_HYDROData_Stream.cxx test_Dependencies.cxx - + test_HYDROData_Tool.cxx + TestShape.cxx TestViewer.cxx TestLib_Listener.cxx @@ -67,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 ) @@ -75,11 +77,11 @@ SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome ) IF( ${WIN32} ) link_directories( $ENV{CASROOT}/win32/libd ) 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{QT5_ROOT_DIR}/lib ) +link_directories( $ENV{QTDIR}/lib ) IF( ${WIN32} ) SET( QT_LIBRARIES QtCored4 QtGuid4 QtTestd4 ) ELSE()