CMake: Edition accumulation of LD_LIBRARY_PATH and PATH

diff --git a/salome_adm/cmake_files/FindOmniORB.cmake b/salome_adm/cmake_files/FindOmniORB.cmake
index e0924769b65f496d7f11ad43e56114d494d114f1..5d005b75d0c52f9da34796188e3cbdf0c6b32525 100644 (file)
--- 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 ba853fc75cfc062ea9aa9929c834cd6491591114..fefba9d3688ad7b57015cd6c3a303527a6e154d9 100644 (file)
--- 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 ff57ee14bfdcb1c17712cd394aeba4e44c8fdacc..be0b2f22d2bb8bd60c2ec55a5dc077091ef62127 100644 (file)
--- 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()