CMake: Edition accumulation of LD_LIBRARY_PATH, PATH and PYTHONPATH

diff --git a/adm_local/cmake_files/FindPyQt4.cmake b/adm_local/cmake_files/FindPyQt4.cmake
index 39da89c093fab524167eccad4a948a8d5da91420..3d62edbd9ad9a5569b463f1ed1b2ac70a4d14445 100644 (file)
--- 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 5011f5d134e19fad8b77183faf391ac1f64f7b6f..5283ae75f6829d4344ecb5b0ad72f245e94d11bf 100644 (file)
--- 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 31ea8fbfb5feea349ea6603f4110a4b9b02a49c6..4acee13b7821313199be418dac1f2b9eda5ed916 100644 (file)
--- 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 ccca972b4bac8c06c6d32ccb2c0b291584931145..94a2a6387bcd3f05ea8513392d85127bb9970914 100644 (file)
--- 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 14bd8832adcb442d3010ff2050cdeb76f674841f..dd925c040d952317a7be3f731c443919d1cb0ae1 100644 (file)
--- 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 496e74516b386fcd568d40becbfd4e4fb1b3cf41..b191adddc2f67428a1fe03acffbe8403f0ba46cc 100644 (file)
--- 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()