From: Maintenance team (INV) <mnt@opencascade.com>
Date: Thu, 14 Jan 2016 18:28:53 +0000 (+0300)
Subject: Synchronize adm files
X-Git-Tag: V7_8_0a2~22
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bcaad1cbce4f926d33d501a47c0151738e077048;p=tools%2Fdocumentation.git

Synchronize adm files
---

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: