From: vsr <vsr@opencascade.com>
Date: Thu, 14 Jan 2016 14:41:17 +0000 (+0300)
Subject: Merge branch 'V8_0_BR'
X-Git-Tag: V8_0_0a2^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=26fd051115d17d0913be52f7c328e122d17b1bd5;p=modules%2Fkernel.git

Merge branch 'V8_0_BR'
---

26fd051115d17d0913be52f7c328e122d17b1bd5
diff --cc salome_adm/cmake_files/SalomeMacros.cmake
index 1d05bc0b6,2f1b254ec..445e75ba0
--- a/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: