From: mpa <mpa@opencascade.com>
Date: Thu, 31 Oct 2013 06:06:03 +0000 (+0000)
Subject: CMake: Edition accumulation of LD_LIBRARY_PATH and PATH
X-Git-Tag: BR_hydro_v_0_3_1~38
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0a06bd66f82a9ef05dd4cf14df6a49ec77fd048a;p=modules%2Fkernel.git

CMake: Edition accumulation of LD_LIBRARY_PATH and PATH
---

diff --git a/salome_adm/cmake_files/FindSalomeOmniORB.cmake b/salome_adm/cmake_files/FindSalomeOmniORB.cmake
index 0eb0cce74..ba853fc75 100644
--- a/salome_adm/cmake_files/FindSalomeOmniORB.cmake
+++ b/salome_adm/cmake_files/FindSalomeOmniORB.cmake
@@ -28,9 +28,6 @@ SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OmniORB OMNIORB_INCLUDE_DIR 1)
 
 IF(OMNIORB_FOUND) 
   SALOME_ACCUMULATE_HEADERS(OMNIORB_INCLUDE_DIR)
-  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}/lib64/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OMNIORB_LIBRARIES})
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${OMNIORB_LIBRARIES})
 ENDIF()
\ No newline at end of file
diff --git a/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake b/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake
index e3d381170..ff57ee14b 100644
--- a/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake
+++ b/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake
@@ -49,10 +49,7 @@ ELSE()
   ENDIF()
 ENDIF()
 
-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)
+IF(OMNIORBPY_FOUND)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OMNIORBPY_LIBRARIES})
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${OMNIORBPY_LIBRARIES})
 ENDIF()
diff --git a/salome_adm/cmake_files/FindSalomePaco.cmake b/salome_adm/cmake_files/FindSalomePaco.cmake
index 9026f0116..c82713d05 100644
--- a/salome_adm/cmake_files/FindSalomePaco.cmake
+++ b/salome_adm/cmake_files/FindSalomePaco.cmake
@@ -27,8 +27,6 @@ SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Paco PACO_INCLUDE_DIRS 1)
 #MARK_AS_ADVANCED()
 
 IF(SALOMEPACO_FOUND) 
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${PACO_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PACO_ROOT_DIR}/lib)
-  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${PACO_ROOT_DIR}/lib 
-                                           ${PACO_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PACO_LIBRARIES})
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${PACO_LIBRARIES})
 ENDIF()
diff --git a/salome_adm/cmake_files/FindSalomePython.cmake b/salome_adm/cmake_files/FindSalomePython.cmake
index c775e0163..b6f77ffa5 100644
--- a/salome_adm/cmake_files/FindSalomePython.cmake
+++ b/salome_adm/cmake_files/FindSalomePython.cmake
@@ -175,7 +175,6 @@ ENDIF()
 
 IF(SALOMEPYTHON_FOUND) 
   #SALOME_ACCUMULATE_HEADERS(PYTHON_INCLUDE_DIR)
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${PYTHON_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PYTHON_ROOT_DIR}/lib)
-  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${PYTHON_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PYTHON_LIBRARIES})
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${PYTHON_LIBRARIES})
 ENDIF()