From e4ccfb4b736b31d8f1ea891011fce50571aefbda Mon Sep 17 00:00:00 2001
From: mnt <mnt@opencascade.com>
Date: Thu, 26 May 2016 21:11:35 +0300
Subject: [PATCH] Synchronize adm files

---
 adm/cmake/SalomeMacros.cmake | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/adm/cmake/SalomeMacros.cmake b/adm/cmake/SalomeMacros.cmake
index f78ffe4ac..258173142 100644
--- a/adm/cmake/SalomeMacros.cmake
+++ b/adm/cmake/SalomeMacros.cmake
@@ -563,8 +563,13 @@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS pkg referenceVariable upCount)
        #  Note the double de-reference of "referenceVariable":
        SET(_tmp_ROOT_DIR "${${referenceVariable}}")
     ENDIF()
-    IF(${upCount}) 
-      FOREACH(_unused RANGE 1 ${upCount})        
+    # Up cound can be reset by detection procedure
+    SET(_upCount ${upCount})
+    IF(DEFINED ${pkg_UC}_UPCOUNT)
+      SET(_upCount ${${pkg_UC}_UPCOUNT})
+    ENDIF()
+    IF(${_upCount}) 
+      FOREACH(_unused RANGE 1 ${_upCount})        
         GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${_tmp_ROOT_DIR}" PATH)
       ENDFOREACH()
     ENDIF()
-- 
2.30.2