From 16bf2ee1a7183f993bcac2271e39f84382ed644e Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Thu, 3 Dec 2015 17:10:04 +0100 Subject: [PATCH] compilation calibre --- src/HYDRO_tests/CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt index f41a9c59..07fa477d 100644 --- a/src/HYDRO_tests/CMakeLists.txt +++ b/src/HYDRO_tests/CMakeLists.txt @@ -59,28 +59,28 @@ IF( ${WIN32} ) add_definitions( -DWNT ) ENDIF() -SET( BOOST_INCLUDES $ENV{BOOST_ROOT_DIR}/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( BOOST_INCLUDES $ENV{BOOST_ROOT}/include/boost-1_52 ) +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( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome ) SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome ) IF( ${WIN32} ) - link_directories( $ENV{CAS_ROOT_DIR}/win32/libd ) + link_directories( $ENV{CASROOT}/win32/libd ) ELSE() - link_directories( $ENV{CAS_ROOT_DIR}/lib ) + link_directories( $ENV{CASROOT}/lib ) 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{QT4_ROOT_DIR}/lib ) +link_directories( $ENV{QTDIR}/lib ) IF( ${WIN32} ) SET( QT_LIBRARIES QtCored4 QtGuid4 QtTestd4 ) ELSE() SET( QT_LIBRARIES QtCore QtGui QtTest ) ENDIF() -link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib ) +link_directories( $ENV{CPPUNIT_ROOT}/lib ) IF( ${WIN32} ) SET( CPPUNIT_LIBRARIES cppunitd ) ELSE() @@ -106,7 +106,7 @@ include_directories( source_group( "External files" FILES ${EXTERNAL_FILES} ) add_executable( HYDROData_tests ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${EXTERNAL_FILES} ${PROJECT_MOC_HEADERS} ) -target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib ) +target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_LIBRARIES} ${QT_LIBRARIES} ${CPPUNIT_LIBRARIES} shapelib HYDROData) IF( ${WIN32} ) add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" ) -- 2.39.2