From: prascle <prascle>
Date: Tue, 15 Mar 2005 16:33:51 +0000 (+0000)
Subject: PR: define SIP version
X-Git-Tag: SARGE_Port_V221_18mar05~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c81fe4d06c6681a5229a11dccad84f33e76894c7;p=modules%2Fkernel.git

PR: define SIP version
---

diff --git a/src/SALOMEGUI/Makefile.in b/src/SALOMEGUI/Makefile.in
index d3acbc362..bd8f7efdd 100644
--- a/src/SALOMEGUI/Makefile.in
+++ b/src/SALOMEGUI/Makefile.in
@@ -221,7 +221,7 @@ LIB_CLIENT_IDL = SALOMEDS.idl \
 		 SALOME_ContainerManager.idl \
 		 SALOME_Exception.idl
 
-CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES)
+CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) -DSIP_VERS_@SIP_VERS@
 LDFLAGS+=$(QT_MT_LIBS) -lSalomeNS -lqsplitterP -lSalomeLifeCycleCORBA -lOpUtil -lSalomeObject -lEvent -lSalomePrs
 
 LIBS+= $(PYTHON_LIBS)
diff --git a/src/SALOMEGUI/QAD_Desktop.cxx b/src/SALOMEGUI/QAD_Desktop.cxx
index 4a1184355..cbc5a92e7 100644
--- a/src/SALOMEGUI/QAD_Desktop.cxx
+++ b/src/SALOMEGUI/QAD_Desktop.cxx
@@ -3349,7 +3349,7 @@ SALOMEGUI* QAD_Desktop::getComponentGUI( const QString& component )
 #ifdef WNT
 	dir = dir + "libSalomePyQtcmodule.dll" ;
 #else
-#if SIP_VERS == v4_1
+#ifdef SIP_VERS_v4_1
 	dir = dir + "SalomePyQt.so" ;
 #else
 	dir = dir + "libSalomePyQtcmodule.so" ;