From bcaad1cbce4f926d33d501a47c0151738e077048 Mon Sep 17 00:00:00 2001
From: "Maintenance team (INV)" <mnt@opencascade.com>
Date: Thu, 14 Jan 2016 21:28:53 +0300
Subject: [PATCH] Synchronize adm files

---
 CMakeModules/SalomeMacros.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeModules/SalomeMacros.cmake b/CMakeModules/SalomeMacros.cmake
index 6b43e22..1d05bc0 100644
--- a/CMakeModules/SalomeMacros.cmake
+++ b/CMakeModules/SalomeMacros.cmake
@@ -503,7 +503,9 @@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS pkg referenceVariable upCount)
   
   # Override the variable - don't append to it, as it would give precedence
   # to what was stored there before!  
-  SET(CMAKE_PREFIX_PATH "${${pkg_UC}_ROOT_DIR}")
+  IF(DEFINED ENV{${pkg_UC}_ROOT_DIR})
+    SET(CMAKE_PREFIX_PATH "${${pkg_UC}_ROOT_DIR}")
+  ENDIF()
     
   # Try find_package in config mode. This has the priority, but is 
   # performed QUIET and not REQUIRED:
-- 
2.39.2