From b5932f72a3143f71d674669395804f15534802c9 Mon Sep 17 00:00:00 2001
From: mpa <mpa@opencascade.com>
Date: Thu, 31 Oct 2013 10:22:41 +0000
Subject: [PATCH] CMake: Edition accumulation of LD_LIBRARY_PATH, PATH and
 PYTHONPATH

---
 adm_local/cmake_files/FindPyQt4.cmake       | 2 +-
 adm_local/cmake_files/FindSIP.cmake         | 2 +-
 adm_local/cmake_files/FindSalomePyQt4.cmake | 7 +++----
 adm_local/cmake_files/FindSalomeQt4.cmake   | 5 ++---
 adm_local/cmake_files/FindSalomeQwt.cmake   | 2 +-
 adm_local/cmake_files/FindSalomeSIP.cmake   | 6 +++---
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/adm_local/cmake_files/FindPyQt4.cmake b/adm_local/cmake_files/FindPyQt4.cmake
index 39da89c09..3d62edbd9 100644
--- a/adm_local/cmake_files/FindPyQt4.cmake
+++ b/adm_local/cmake_files/FindPyQt4.cmake
@@ -70,7 +70,7 @@ ENDIF()
 MARK_AS_ADVANCED(PYQT_SIP_MAIN_FILE)
 
 # Get PyQt compilation flags:
-SET(PYQT_PYTHONPATH ${_tmp_ROOT_DIR} ${_tmp_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
+SET(PYQT_PYTHONPATH ${_tmp_ROOT_DIR}/PyQt4)
 SET(PYQT_SIPFLAGS)
 
 EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; 
diff --git a/adm_local/cmake_files/FindSIP.cmake b/adm_local/cmake_files/FindSIP.cmake
index 5011f5d13..5283ae75f 100644
--- a/adm_local/cmake_files/FindSIP.cmake
+++ b/adm_local/cmake_files/FindSIP.cmake
@@ -2,7 +2,7 @@
 # Sets the following variables:
 #   SIP_EXECUTABLE      - path to the SIP executable
 #   SIP_INCLUDE_DIR     - path to the SIP headers
-#   SIP_PYTHON_PATH     - path to the SIP Python packages
+#   SIP_PYTHONPATH      - path to the SIP Python packages
 #
 #  The header sip.h is looked for.
 #  The binary 'sip' is looked for.
diff --git a/adm_local/cmake_files/FindSalomePyQt4.cmake b/adm_local/cmake_files/FindSalomePyQt4.cmake
index 31ea8fbfb..4acee13b7 100644
--- a/adm_local/cmake_files/FindSalomePyQt4.cmake
+++ b/adm_local/cmake_files/FindSalomePyQt4.cmake
@@ -31,8 +31,7 @@ SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(PyQt4 PYQT_PYUIC_EXECUTABLE 2)
 MARK_AS_ADVANCED(PYQT_PYUIC_EXECUTABLE PYQT_PYRCC_EXECUTABLE PYQT_SIPS_DIR PYQT_PYUIC_PATH PYQT_PYRCC_PATH)
 
 IF(PYQT4_FOUND) 
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${PYQT4_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PYQT4_ROOT_DIR}/PyQt4)
-  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${PYQT4_ROOT_DIR}
-                                           ${PYQT4_ROOT_DIR}/PyQt4)
+  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${PYQT_PYUIC_EXECUTABLE})
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PYQT_PYTHONPATH})
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${PYQT_PYTHONPATH})
 ENDIF()
diff --git a/adm_local/cmake_files/FindSalomeQt4.cmake b/adm_local/cmake_files/FindSalomeQt4.cmake
index ccca972b4..94a2a6387 100644
--- a/adm_local/cmake_files/FindSalomeQt4.cmake
+++ b/adm_local/cmake_files/FindSalomeQt4.cmake
@@ -28,7 +28,6 @@ MARK_AS_ADVANCED(QT_QMAKE_EXECUTABLE)
 
 IF(QT4_FOUND) 
   SALOME_ACCUMULATE_HEADERS(QT_INCLUDES)
-  SALOME_ACCUMULATE_ENVIRONMENT(QT_PLUGIN_PATH ${QT4_ROOT_DIR}/plugins)
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${QT4_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${QT4_ROOT_DIR}/lib)
+  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${QT_QMAKE_EXECUTABLE})
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${QT_QTCORE_LIBRARY})
 ENDIF()
diff --git a/adm_local/cmake_files/FindSalomeQwt.cmake b/adm_local/cmake_files/FindSalomeQwt.cmake
index 14bd8832a..dd925c040 100644
--- a/adm_local/cmake_files/FindSalomeQwt.cmake
+++ b/adm_local/cmake_files/FindSalomeQwt.cmake
@@ -28,5 +28,5 @@ MARK_AS_ADVANCED(QWT_INCLUDE_DIR QWT_LIBRARY)
 
 IF(QWT_FOUND)
   SALOME_ACCUMULATE_HEADERS(QWT_INCLUDE_DIR)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${QWT_ROOT_DIR}/lib)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${QWT_LIBRARY})
 ENDIF()
\ No newline at end of file
diff --git a/adm_local/cmake_files/FindSalomeSIP.cmake b/adm_local/cmake_files/FindSalomeSIP.cmake
index 496e74516..b191adddc 100644
--- a/adm_local/cmake_files/FindSalomeSIP.cmake
+++ b/adm_local/cmake_files/FindSalomeSIP.cmake
@@ -27,8 +27,8 @@ SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(SIP SIP_EXECUTABLE 2)
 MARK_AS_ADVANCED(SIP_EXECUTABLE SIP_INCLUDE_DIR)
 
 IF(SIP_FOUND) 
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${SIP_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${SIP_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
-  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${SIP_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
+  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${SIP_EXECUTABLE})
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${SIP_PYTHONPATH})
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${SIP_PYTHONPATH})
 ENDIF()
 
-- 
2.39.2