From fd25b500a63e05be26d2c318f2399e7a2f0a0bbf Mon Sep 17 00:00:00 2001 From: mpa Date: Tue, 29 Oct 2013 07:45:55 +0000 Subject: [PATCH] CMake: - Accumulate environment variables, to be used later to run some command in proper environment. --- salome_adm/cmake_files/FindSalomeOmniORB.cmake | 3 ++- salome_adm/cmake_files/FindSalomeOmniORBPy.cmake | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/salome_adm/cmake_files/FindSalomeOmniORB.cmake b/salome_adm/cmake_files/FindSalomeOmniORB.cmake index bddee88bb..0eb0cce74 100644 --- a/salome_adm/cmake_files/FindSalomeOmniORB.cmake +++ b/salome_adm/cmake_files/FindSalomeOmniORB.cmake @@ -31,5 +31,6 @@ IF(OMNIORB_FOUND) SALOME_ACCUMULATE_ENVIRONMENT(PATH ${OMNIORB_ROOT_DIR}/bin) SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OMNIORB_ROOT_DIR}/lib) SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${OMNIORB_ROOT_DIR}/lib - ${OMNIORB_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) + ${OMNIORB_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages + ${OMNIORB_ROOT_DIR}/lib64/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) ENDIF() \ No newline at end of file diff --git a/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake b/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake index 08d85ceed..e3d381170 100644 --- a/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake +++ b/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake @@ -49,9 +49,10 @@ ELSE() ENDIF() ENDIF() -IF(SalomeOmniORB_FOUND) - SALOME_ACCUMULATE_ENVIRONMENT(PATH ${OMNIORB_ROOT_DIR}/bin) - SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OMNIORB_ROOT_DIR}/lib) - SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${OMNIORB_ROOT_DIR}/lib - ${OMNIORB_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) +IF(OMNIORBPY_FOUND) + SALOME_ACCUMULATE_ENVIRONMENT(PATH ${OMNIORBPY_ROOT_DIR}/bin) + SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OMNIORBPY_ROOT_DIR}/lib) + SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${OMNIORBPY_ROOT_DIR}/lib + ${OMNIORBPY_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages + ${OMNIORBPY_ROOT_DIR}/lib64/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) ENDIF() -- 2.39.2