X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=adm_local%2Fcmake_files%2FFindSalomePyQt4.cmake;h=034cd1360ae740ddc05fed349df6e4489b43f1d9;hb=3a0ba13afff7a465ade65e11e7b84f22a658bea4;hp=390b6f6849b22256b9f0fb5cfeea04801ca5ddf6;hpb=76882c013882557173fef567d42711d5f3345eeb;p=modules%2Fgui.git

diff --git a/adm_local/cmake_files/FindSalomePyQt4.cmake b/adm_local/cmake_files/FindSalomePyQt4.cmake
index 390b6f684..034cd1360 100644
--- a/adm_local/cmake_files/FindSalomePyQt4.cmake
+++ b/adm_local/cmake_files/FindSalomePyQt4.cmake
@@ -1,9 +1,9 @@
-# Copyright (C) 2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,28 +19,19 @@
 # Author: Adrien Bruneton
 #
 
-# PyQt4 detection dor Salome
+# PyQt4 detection for Salome
 #
 #  !! Please read the generic detection procedure in SalomeMacros.cmake !!
 #
 
-IF(NOT SalomeSIP_FOUND AND NOT SalomePyQt4_FIND_QUIETLY)
-   MESSAGE(WARNING "PyQt4 needs SIP to be detected correctly!")
-ENDIF()   
+# PyQt needs SIP, call it automatically
+FIND_PACKAGE(SalomeSIP REQUIRED)
 
 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)
 
-# Wrap the final executables so that they always use the proper environment (PYTHONPATH):
-# The results are put to variables:
-#   PYQT_PYUIC_PATH - command to launch pyuic with the correct PYTHONPATH
-#   PYQT_PYRCC_PATH - command to launch pyrcc with the correct PYTHONPATH
-# TODO: should be done like Sphinx in KERNEL (i.e. generating a shell script)?
-IF(WIN32 AND NOT CYGWIN)
-  MESSAGE(WARNING "PyQt4 command was not tested under Win32")
-  SET(PYQT_PYUIC_PATH set PYTHONPATH=${PYQT_PYTHONPATH};${SIP_PYTHONPATH};%PYTHONPATH% && ${PYQT_PYUIC_EXECUTABLE})
-  SET(PYQT_PYRCC_PATH set PYTHONPATH=${PYQT_PYTHONPATH};${SIP_PYTHONPATH};%PYTHONPATH% && ${PYQT_PYRCC_EXECUTABLE})
-ELSE()
-  SET(PYQT_PYUIC_PATH /usr/bin/env PYTHONPATH="${PYQT_PYTHONPATH}:${SIP_PYTHONPATH}:$$PYTHONPATH" ${PYQT_PYUIC_EXECUTABLE})
-  SET(PYQT_PYRCC_PATH /usr/bin/env PYTHONPATH="${PYQT_PYTHONPATH}:${SIP_PYTHONPATH}:$$PYTHONPATH" ${PYQT_PYRCC_EXECUTABLE})
+IF(PYQT4_FOUND) 
+  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${PYQT_PYUIC_EXECUTABLE})
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PYQT_PYTHONPATH})
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${PYQT_PYTHONPATH})
 ENDIF()