From: barate <barate>
Date: Tue, 9 Jul 2013 14:43:55 +0000 (+0000)
Subject: Fix bug with CMAKE_FIND_ROOT_PATH variable in FindOmniORBPy.cmake
X-Git-Tag: B4KillOfAutomake~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d2691f37390b98ad478f7da0d6c11fe6cadf77d5;p=modules%2Fkernel.git

Fix bug with CMAKE_FIND_ROOT_PATH variable in FindOmniORBPy.cmake
---

diff --git a/salome_adm/cmake_files/FindOmniORBPy.cmake b/salome_adm/cmake_files/FindOmniORBPy.cmake
index fd6a2cca3..a151c54a9 100644
--- a/salome_adm/cmake_files/FindOmniORBPy.cmake
+++ b/salome_adm/cmake_files/FindOmniORBPy.cmake
@@ -34,17 +34,11 @@
 ##############################################################################
 
 SET(_py_version "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
-SET(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH})
-SET(_doc "Path to python-backend directory (omniidl_be) including python.py file")
-IF(WIN32)
-  FIND_PATH(OMNIORB_PYTHON_BACKEND
-     NAMES python.py PATHS "/lib/python/omniidl_be" DOC ${_doc}) 
-ELSE()
-  FIND_PATH(OMNIORB_PYTHON_BACKEND
-     NAMES python.py
-     PATHS "/lib/python${_py_version}/site-packages/omniidl_be" "/usr/lib/omniidl/omniidl_be" 
-     DOC ${_doc})
-ENDIF()
+FIND_PATH(OMNIORB_PYTHON_BACKEND
+  NAMES python.py
+  PATHS "${OMNIORBPY_ROOT_DIR}" "/usr" 
+  PATH_SUFFIXES "/lib/python${_py_version}/site-packages/omniidl_be" "/lib/omniidl/omniidl_be" "/lib/python/omniidl_be"
+  DOC "Path to python-backend directory (omniidl_be) including python.py file")
 
 ##############################################################################
 # Cook our stuff