Merge branch 'V8_0_BR'

diff --cc salome_adm/cmake_files/SalomeMacros.cmake
index 1d05bc0b66763c4438b070a963b876f64243a838,2f1b254eca397439f623da31ca01f5a563030230..445e75ba05ab7fad7f9416c181a25f88aed139e7
--- 1/salome_adm/cmake_files/SalomeMacros.cmake
--- 2/salome_adm/cmake_files/SalomeMacros.cmake
+++ b/salome_adm/cmake_files/SalomeMacros.cmake
@@@ -503,9 -507,7 +507,9 @@@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CO
    
    # Override the variable - don't append to it, as it would give precedence
    # to what was stored there before!  
-   IF(DEFINED ENV{${pkg_UC}_ROOT_DIR})
-     SET(CMAKE_PREFIX_PATH "${${pkg_UC}_ROOT_DIR}")
 -  SET(CMAKE_PREFIX_PATH "${${_envvar}}")
++  IF(DEFINED ENV{${_envvar}})
++    SET(CMAKE_PREFIX_PATH "${${_envvar}}")
 +  ENDIF()
      
    # Try find_package in config mode. This has the priority, but is 
    # performed QUIET and not REQUIRED: