X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=adm_local%2Fcmake_files%2FFindPyQt4.cmake;h=a282819ad9f32f2babcd1ddbed9dd5077b1f51d6;hb=11a370454e581b8e532a2a58bff6cd18136ebafd;hp=6a564e7d51fab462881777c04a73de05b770d9bf;hpb=b6d6fbbfd002797df3e21aa3b0762ae1dbc13a2d;p=modules%2Fgui.git

diff --git a/adm_local/cmake_files/FindPyQt4.cmake b/adm_local/cmake_files/FindPyQt4.cmake
index 6a564e7d5..a282819ad 100644
--- a/adm_local/cmake_files/FindPyQt4.cmake
+++ b/adm_local/cmake_files/FindPyQt4.cmake
@@ -1,3 +1,22 @@
+# 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, 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
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
 # - Find PyQt4 installation
 # Sets the following variables:
 #    PYQT_PYUIC_EXECUTABLE  - path to the pyuic executable
@@ -6,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
@@ -18,29 +36,6 @@
 #  Headers are located by looking for the header file
 #      qobject.sip
 
-#########################################################################
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-#
-# 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.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
 IF(NOT PyQt4_FIND_QUIETLY)
   MESSAGE(STATUS "Looking for PyQt4 ...")
 ENDIF()
@@ -81,25 +76,7 @@ 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} -I "${PYQT_SIPS_DIR}")
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PyQt4 REQUIRED_VARS PYQT_PYUIC_EXECUTABLE PYQT_PYRCC_EXECUTABLE PYQT_SIPS_DIR PYQT_SIPFLAGS )