From: vsr <vsr@opencascade.com>
Date: Thu, 28 Jan 2016 08:36:17 +0000 (+0300)
Subject: Remove unnecessary PYQT_INCLUDE_DIRS variable.
X-Git-Tag: V8_0_0rc1~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d6acedfee7db8d699b7bfde39ee218544fb4a10a;p=modules%2Fgui.git

Remove unnecessary PYQT_INCLUDE_DIRS variable.
---

diff --git a/adm_local/cmake_files/FindPyQt4.cmake b/adm_local/cmake_files/FindPyQt4.cmake
index 0d204938b..107582cd0 100644
--- a/adm_local/cmake_files/FindPyQt4.cmake
+++ b/adm_local/cmake_files/FindPyQt4.cmake
@@ -25,7 +25,6 @@
 #    PYQT_PYRCC_PATH        - command to launch pyrcc with the correct PYTHONPATH
 #    PYQT_PYTHONPATH        - path to the PyQt Python modules
 #    PYQT_SIPS_DIR          - path to main include directory (which contains several sub folders)
-#    PYQT_INCLUDE_DIRS      - list of paths to include when compiling (all rooted on PYQT_SIP_DIRS)
 #    PYQT_SIPFLAGS          - compilation flags extracted from PyQt
 #
 #  The executables
@@ -77,25 +76,8 @@ sys.stdout.write(pyqtconfig.Configuration().pyqt_sip_flags)"
   OUTPUT_VARIABLE PYQT_SIPFLAGS)
 SEPARATE_ARGUMENTS(PYQT_SIPFLAGS)
 
-SET(PYQT_INCLUDE_DIRS
-  "${PYQT_SIPS_DIR}"
-  "${PYQT_SIPS_DIR}/QtCore"
-  "${PYQT_SIPS_DIR}/QtGui"
-  "${PYQT_SIPS_DIR}/QtXml"
-  "${PYQT_SIPS_DIR}/QtOpenGL"
-  "${PYQT_SIPS_DIR}/QtAssistant"
-  "${PYQT_SIPS_DIR}/QtDesigner"
-  "${PYQT_SIPS_DIR}/QtNetwork"
-  "${PYQT_SIPS_DIR}/QtSql"
-  "${PYQT_SIPS_DIR}/QtSvg"
-  "${PYQT_SIPS_DIR}/QtTest"
-)
-
 SET(PYQT_CXX_EXT ".cc")
-SET(PYQT_SIPFLAGS ${PYQT_SIPFLAGS} -s ${PYQT_CXX_EXT} -c .)
-FOREACH(_dir ${PYQT_INCLUDE_DIRS})
-  LIST(APPEND PYQT_SIPFLAGS -I ${_dir})
-ENDFOREACH()
+SET(PYQT_SIPFLAGS ${PYQT_SIPFLAGS} -s ${PYQT_CXX_EXT} -I "${PYQT_SIPS_DIR}" -c .)
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PyQt4 REQUIRED_VARS PYQT_PYUIC_EXECUTABLE PYQT_PYRCC_EXECUTABLE PYQT_SIPS_DIR PYQT_SIPFLAGS )
diff --git a/adm_local/cmake_files/FindPyQt5.cmake b/adm_local/cmake_files/FindPyQt5.cmake
index b255db01e..b1fec0e39 100644
--- a/adm_local/cmake_files/FindPyQt5.cmake
+++ b/adm_local/cmake_files/FindPyQt5.cmake
@@ -25,7 +25,6 @@
 #    PYQT_PYRCC_PATH        - command to launch pyrcc with the correct PYTHONPATH
 #    PYQT_PYTHONPATH        - path to the PyQt Python modules
 #    PYQT_SIPS_DIR          - path to main include directory (which contains several sub folders)
-#    PYQT_INCLUDE_DIRS      - list of paths to include when compiling (all rooted on PYQT_SIP_DIRS)
 #    PYQT_SIPFLAGS          - compilation flags extracted from PyQt
 #
 #  The executables
@@ -77,25 +76,8 @@ sys.stdout.write(PYQT_CONFIGURATION['sip_flags'])"
   OUTPUT_VARIABLE PYQT_SIPFLAGS)
 SEPARATE_ARGUMENTS(PYQT_SIPFLAGS)
 
-SET(PYQT_INCLUDE_DIRS
-  "${PYQT_SIPS_DIR}"
-  "${PYQT_SIPS_DIR}/QtCore"
-  "${PYQT_SIPS_DIR}/QtGui"
-  "${PYQT_SIPS_DIR}/QtXml"
-  "${PYQT_SIPS_DIR}/QtOpenGL"
-  "${PYQT_SIPS_DIR}/QtAssistant"
-  "${PYQT_SIPS_DIR}/QtDesigner"
-  "${PYQT_SIPS_DIR}/QtNetwork"
-  "${PYQT_SIPS_DIR}/QtSql"
-  "${PYQT_SIPS_DIR}/QtSvg"
-  "${PYQT_SIPS_DIR}/QtTest"
-)
-
 SET(PYQT_CXX_EXT ".cc")
-SET(PYQT_SIPFLAGS ${PYQT_SIPFLAGS} -s ${PYQT_CXX_EXT} -c .)
-FOREACH(_dir ${PYQT_INCLUDE_DIRS})
-  LIST(APPEND PYQT_SIPFLAGS -I ${_dir})
-ENDFOREACH()
+SET(PYQT_SIPFLAGS ${PYQT_SIPFLAGS} -s ${PYQT_CXX_EXT} -I "${PYQT_SIPS_DIR}" -c .)
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PyQt5 REQUIRED_VARS PYQT_PYUIC_EXECUTABLE PYQT_PYRCC_EXECUTABLE PYQT_SIPS_DIR PYQT_SIPFLAGS )
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.sip b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.sip
index 1601b48f9..a38add5af 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.sip
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.sip
@@ -27,4 +27,4 @@
 %If (Qt_5_0_0 -)
 %Import QtWidgets/QtWidgetsmod.sip
 %End
-%Import QtXmlmod.sip
+%Import QtXml/QtXmlmod.sip
diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
index 3690f86b9..54490bf0c 100644
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
@@ -33,7 +33,7 @@
 %If (Qt_5_0_0 -)
 %Import QtWidgets/QtWidgetsmod.sip
 %End
-%Import QtXmlmod.sip
+%Import QtXml/QtXmlmod.sip
 
 %If (ENABLE_PLOT2D)
 %Include SalomePyQt_Plot2d.sip