From c6272385c8884976a9b869df1b3e1fb174ccd6d4 Mon Sep 17 00:00:00 2001
From: mpa <mpa@opencascade.com>
Date: Thu, 31 Oct 2013 07:14:23 +0000
Subject: [PATCH] CMake: Edition accumulation of LD_LIBRARY_PATH and PATH

---
 salome_adm/cmake_files/FindOmniORB.cmake         | 5 +++++
 salome_adm/cmake_files/FindSalomeOmniORB.cmake   | 3 ++-
 salome_adm/cmake_files/FindSalomeOmniORBPy.cmake | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/salome_adm/cmake_files/FindOmniORB.cmake b/salome_adm/cmake_files/FindOmniORB.cmake
index e0924769b..5d005b75d 100644
--- a/salome_adm/cmake_files/FindOmniORB.cmake
+++ b/salome_adm/cmake_files/FindOmniORB.cmake
@@ -7,6 +7,7 @@
 # OMNIORB_VERSION      - OmniORB4 version
 # OMNIORB_IDL_COMPILER - OmniORB4 idl compiler command (omniidl)
 # OMNIORB_NAMESERVER   - OmniORB4 CORBA naming service (omniNames)
+# OMNIORB_PYTHONPATH   - path to the OmniORB Python modules 
 # and many other mainly used in UseOmniORB.cmake  
 #
 # Detection is made through calls to 
@@ -127,6 +128,10 @@ IF(OMNIORB_LIBRARY_COSDynamic4)
     LIST(APPEND OMNIORB_LIBRARIES ${OMNIORB_LIBRARY_COSDynamic4})
 ENDIF()
 
+# Set path to the OmniORB Python modules
+GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${OMNIORB_LIBRARIES}" PATH) 
+SET(OMNIORB_PYTHONPATH "${_tmp_ROOT_DIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
+
 # Optionaly, extract the the version number from the acconfig.h file:
 # The version check is done at the very bottom of this file.
 IF( EXISTS ${OMNIORB_INCLUDE_DIR}/omniORB4/acconfig.h )
diff --git a/salome_adm/cmake_files/FindSalomeOmniORB.cmake b/salome_adm/cmake_files/FindSalomeOmniORB.cmake
index ba853fc75..fefba9d36 100644
--- a/salome_adm/cmake_files/FindSalomeOmniORB.cmake
+++ b/salome_adm/cmake_files/FindSalomeOmniORB.cmake
@@ -29,5 +29,6 @@ SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OmniORB OMNIORB_INCLUDE_DIR 1)
 IF(OMNIORB_FOUND) 
   SALOME_ACCUMULATE_HEADERS(OMNIORB_INCLUDE_DIR)
   SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OMNIORB_LIBRARIES})
-  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${OMNIORB_LIBRARIES})
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${OMNIORB_LIBRARIES}
+                                           ${OMNIORB_PYTHONPATH})
 ENDIF()
\ No newline at end of file
diff --git a/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake b/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake
index ff57ee14b..be0b2f22d 100644
--- a/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake
+++ b/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake
@@ -51,5 +51,6 @@ ENDIF()
 
 IF(OMNIORBPY_FOUND)
   SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OMNIORBPY_LIBRARIES})
-  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${OMNIORBPY_LIBRARIES})
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${OMNIORBPY_LIBRARIES}
+                                           ${OMNIORBPY_PYTHONPATH})
 ENDIF()
-- 
2.39.2