From: Gilles DAVID <gilles-g.david@edf.fr>
Date: Fri, 1 Dec 2017 17:12:26 +0000 (+0100)
Subject: SIP_INCLUDE_DIR must be added after PYTHON_INCLUDE_DIRS
X-Git-Tag: V9_0_0~1^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5c94bc0744fb6ea6b52071e40da931b519780f17;p=modules%2Fgui.git

SIP_INCLUDE_DIR must be added after PYTHON_INCLUDE_DIRS

Otherwise with system Python and compiled SIP, the system sip.h header
(present in PYTHON_INCLUDE_DIRS) is used.
---

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt b/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt
index ded75b88f..ee4db4cc8 100755
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt
@@ -28,8 +28,8 @@ ENDIF()
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
-  ${SIP_INCLUDE_DIRS}
   ${PYTHON_INCLUDE_DIRS}
+  ${SIP_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
index 589e537e1..90208394d 100755
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
@@ -30,8 +30,8 @@ ENDIF()
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
-  ${SIP_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
+  ${SIP_INCLUDE_DIR}
   ${PTHREAD_INCLUDE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${PROJECT_SOURCE_DIR}/src/CAM