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 0eb0cce7462e24ebea2bd44e156021fbd5a66a07..ba853fc75cfc062ea9aa9929c834cd6491591114 100644 (file)
--- 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 e3d381170496c8f516211bb812d5746265dc649b..ff57ee14bfdcb1c17712cd394aeba4e44c8fdacc 100644 (file)
--- 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 9026f01161f03bafc7b85c80d384edc5df005940..c82713d055162890ae5526317347a3a1dccfc6f2 100644 (file)
--- 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 c775e0163e47a143033141dbf941ad46a28c2100..b6f77ffa56bfc05d7c5807f45ad04e1aadd1dfb7 100644 (file)
--- 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()