X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CDMATH%2Ftests%2Fswig%2FCMakeLists.txt;h=416c484f988ceaf5552da13b98e1dddc231b0068;hb=d2fce7e445e622d74e7d8002237606c0c0493e65;hp=ccaaeeff0e688736690e7a445c13be741eb7c7ad;hpb=f346c9baa32aba798edc1d6571f4b8d1b12a4e54;p=tools%2Fsolverlab.git

diff --git a/CDMATH/tests/swig/CMakeLists.txt b/CDMATH/tests/swig/CMakeLists.txt
index ccaaeef..416c484 100755
--- a/CDMATH/tests/swig/CMakeLists.txt
+++ b/CDMATH/tests/swig/CMakeLists.txt
@@ -5,34 +5,25 @@ SET(MESH_MED
   ../ressources/meshCube.med
   )
 
-file(COPY ${MESH_MED} DESTINATION ${CMAKE_BINARY_DIR}/tests/swig)
+file(COPY ${MESH_MED} DESTINATION ${CMAKE_BINARY_DIR}/CDMATH/tests/swig)
 ADD_TEST(TestsCDMATHSwig ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/mainTests.py)
 
 if (CDMATH_WITH_PETSC)
     ADD_TEST(TestsLinearSolverSwig ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/linearSolverTests.py)
-    SET_PROPERTY(TEST TestsLinearSolverSwig        PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${TESTS_LIBRARY_PATH}")
-    SET_PROPERTY(TEST TestsLinearSolverSwig APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${TESTS_PYTHON_PATH}")
-    INSTALL(FILES linearSolverTests.py DESTINATION tests/unit_tests)
+    INSTALL(FILES linearSolverTests.py DESTINATION bin/unit_tests)
 
-    SET_PROPERTY(TEST TestsCDMATHSwig PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${TESTS_LIBRARY_PATH}")
 
 else (CDMATH_WITH_PETSC)
-    SET_PROPERTY(TEST TestsCDMATHSwig PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${TESTS_LIBRARY_PATH}:${HDF5_ROOT_DIR}/lib")
 endif (CDMATH_WITH_PETSC)
 
-SET_PROPERTY(TEST TestsCDMATHSwig APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${TESTS_PYTHON_PATH}")
 
 if (CDMATH_WITH_PYTHON AND CDMATH_WITH_POSTPRO)
   ADD_TEST(Tests_VTK_routines ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_VTK_routines.py)
-  SET_PROPERTY(TEST Tests_VTK_routines        PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${TESTS_LIBRARY_PATH}:${PV_LIB_DIR}")
-  SET_PROPERTY(TEST Tests_VTK_routines APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${TESTS_PYTHON_PATH}:${PV_PYTHON_DIR}")
 
   ADD_TEST(Tests_PV_routines ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_PV_routines.py)
-  SET_PROPERTY(TEST Tests_PV_routines        PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${TESTS_LIBRARY_PATH}:${PV_LIB_DIR}")
-  SET_PROPERTY(TEST Tests_PV_routines APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${TESTS_PYTHON_PATH}:${PV_PYTHON_DIR}")
 
   add_subdirectory (BoySurface)
 endif ()
 
-INSTALL(FILES ${MESH_MED}  mainTests.py test_VTK_routines.py test_PV_routines.py DESTINATION tests/unit_tests)
+INSTALL(FILES ${MESH_MED}  mainTests.py test_VTK_routines.py test_PV_routines.py DESTINATION bin/unit_tests)