From: Bernard Sécherà <bernard.secher@cea.fr>
Date: Mon, 5 Oct 2020 08:28:15 +0000 (+0200)
Subject: set environment for tests
X-Git-Tag: V9_6_0~29
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5ae21189724c2e66b5d69e0777bded923baa91df;p=tools%2Fsolverlab.git

set environment for tests
---

diff --git a/CDMATH/tests/CMakeLists.txt b/CDMATH/tests/CMakeLists.txt
index 97e7a7a..78b8002 100755
--- a/CDMATH/tests/CMakeLists.txt
+++ b/CDMATH/tests/CMakeLists.txt
@@ -33,7 +33,7 @@ IF (CDMATH_WITH_TESTS)
   endif(CDMATH_WITH_PETSC)
 
   if   (CDMATH_WITH_PYTHON)
-    SET(TESTS_PYTHON_PATH ${CMAKE_BINARY_DIR}/CDMATH/swig:${CMAKE_BINARY_DIR}/CDMATH/postprocessing:${MEDCOUPLING_ROOT_DIR}/lib:${MEDFILE_ROOT_DIR}/lib:${PARAVIEW_ROOT_DIR}/lib/:${PARAVIEW_ROOT_DIR}/lib/python3.6/site-packages/:${PARAVIEW_ROOT_DIR}/lib/python3.6/site-packages/vtkmodules/:${CMAKE_INSTALL_PREFIX}/lib/medcoupling:${CMAKE_INSTALL_PREFIX}/lib/med:${PYTHONPATH} ) 
+    SET(TESTS_PYTHON_PATH ${CMAKE_BINARY_DIR}/CDMATH/swig:${CMAKE_BINARY_DIR}/CDMATH/postprocessing:${MEDCOUPLING_ROOT_DIR}/lib:${MEDFILE_ROOT_DIR}/lib:${PARAVIEW_ROOT_DIR}/lib/:${PARAVIEW_ROOT_DIR}/lib/python3.6/site-packages/:${PARAVIEW_ROOT_DIR}/lib/python3.6/site-packages/vtkmodules/:${CMAKE_INSTALL_PREFIX}/lib/medcoupling:${CMAKE_INSTALL_PREFIX}/lib/med:${MATPLOTLIB_ROOT_DIR}/lib/python3.6/site-packages:${PYQT5_ROOT_DIR}:${PYQT5_ROOT_DIR}/lib/python3.6/site-packages:${PYTHONPATH} ) 
   endif(CDMATH_WITH_PYTHON)
 
   TARGET_LINK_LIBRARIES(TestCDMATH TestMesh base mesh ${CPPUNIT_LIBS} ${_extra_lib_TESTS})
diff --git a/CDMATH/tests/examples/HeatEquation1DImplicit/CMakeLists.txt b/CDMATH/tests/examples/HeatEquation1DImplicit/CMakeLists.txt
index dbc53ab..75ef4a1 100755
--- a/CDMATH/tests/examples/HeatEquation1DImplicit/CMakeLists.txt
+++ b/CDMATH/tests/examples/HeatEquation1DImplicit/CMakeLists.txt
@@ -6,14 +6,14 @@ if (CDMATH_WITH_PYTHON )
     SET(CFL  1  )#Courant Friedrichs Lewy number
 
     ADD_TEST(ExampleHeatEquation_1DFV_Implicit_CFL1 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/HeatEquation1DImplicit.py ${NX} ${CFL})
-    SET_PROPERTY(TEST ExampleHeatEquation_1DFV_Implicit_CFL1 PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib/medcoupling:${CMAKE_INSTALL_PREFIX}/lib/med:${MEDCOUPLING_ROOT_DIR}/lib:${MEDFILE_ROOT_DIR}/lib:${PETSC_DIR}/${PETSC_ARCH}/lib:${HDF5_ROOT_DIR}/lib:${PV_LIB_DIR}")
-    SET_PROPERTY(TEST ExampleHeatEquation_1DFV_Implicit_CFL1 APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_INSTALL_PREFIX}/lib/cdmath:${CMAKE_INSTALL_PREFIX}/bin/cdmath:${CMAKE_INSTALL_PREFIX}/bin/cdmath/postprocessing:${CMAKE_INSTALL_PREFIX}/${MEDCOUPLING_INSTALL_PYTHON}:${PV_PYTHON_DIR}")
+    SET_PROPERTY(TEST ExampleHeatEquation_1DFV_Implicit_CFL1 PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib/medcoupling:${CMAKE_INSTALL_PREFIX}/lib/med:${MEDCOUPLING_ROOT_DIR}/lib:${MEDFILE_ROOT_DIR}/lib:${PETSC_DIR}/${PETSC_ARCH}/lib:${HDF5_ROOT_DIR}/lib:${PV_LIB_DIR}:${Python_ROOT_DIR}/lib")
+    SET_PROPERTY(TEST ExampleHeatEquation_1DFV_Implicit_CFL1 APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_INSTALL_PREFIX}/lib/cdmath:${CMAKE_INSTALL_PREFIX}/bin/cdmath:${CMAKE_INSTALL_PREFIX}/bin/cdmath/postprocessing:${CMAKE_INSTALL_PREFIX}/${MEDCOUPLING_INSTALL_PYTHON}:${MATPLOTLIB_ROOT_DIR}/lib/python3.6/site-packages:${PV_PYTHON_DIR}")
 
     SET(CFL  2  )#Courant Friedrichs Lewy number
 
     ADD_TEST(ExampleHeatEquation_1DFV_Implicit_CFL2 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/HeatEquation1DImplicit.py ${NX} ${CFL})
-    SET_PROPERTY(TEST ExampleHeatEquation_1DFV_Implicit_CFL2 PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib/medcoupling:${CMAKE_INSTALL_PREFIX}/lib/med:${MEDCOUPLING_ROOT_DIR}/lib:${MEDFILE_ROOT_DIR}/lib:${PETSC_DIR}/${PETSC_ARCH}/lib:${HDF5_ROOT_DIR}/lib:${PV_LIB_DIR}")
-    SET_PROPERTY(TEST ExampleHeatEquation_1DFV_Implicit_CFL2 APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_INSTALL_PREFIX}/lib/cdmath:${CMAKE_INSTALL_PREFIX}/bin/cdmath:${CMAKE_INSTALL_PREFIX}/bin/cdmath/postprocessing:${CMAKE_INSTALL_PREFIX}/${MEDCOUPLING_INSTALL_PYTHON}:${PV_PYTHON_DIR}")
+    SET_PROPERTY(TEST ExampleHeatEquation_1DFV_Implicit_CFL2 PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib/medcoupling:${CMAKE_INSTALL_PREFIX}/lib/med:${MEDCOUPLING_ROOT_DIR}/lib:${MEDFILE_ROOT_DIR}/lib:${PETSC_DIR}/${PETSC_ARCH}/lib:${HDF5_ROOT_DIR}/lib:${PV_LIB_DIR}:${Python_ROOT_DIR}/lib")
+    SET_PROPERTY(TEST ExampleHeatEquation_1DFV_Implicit_CFL2 APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_INSTALL_PREFIX}/lib/cdmath:${CMAKE_INSTALL_PREFIX}/bin/cdmath:${CMAKE_INSTALL_PREFIX}/bin/cdmath/postprocessing:${CMAKE_INSTALL_PREFIX}/${MEDCOUPLING_INSTALL_PYTHON}:${MATPLOTLIB_ROOT_DIR}/lib/python3.6/site-packages:${PV_PYTHON_DIR}")
 
 endif (CDMATH_WITH_PYTHON )
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8360df7..0856bde 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,7 @@ list (APPEND CMAKE_MODULE_PATH "${SOLVERLAB_SOURCE_DIR}/cmake_files")
 include(ExternalProject)#For PETSc, MED and MEDCoupling
 
 set(Python_ROOT_DIR $ENV{PYTHON_ROOT_DIR} )
+set(PYQT5_ROOT_DIR $ENV{PYQT5_ROOT_DIR} )
 set(PARAVIEW_ROOT_DIR $ENV{PARAVIEW_ROOT_DIR} )
 set(MATPLOTLIB_ROOT_DIR $ENV{MATPLOTLIB_ROOT_DIR} )
 set(HDF5_ROOT_DIR $ENV{HDF5_ROOT_DIR} )