]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
PR: define SIP version
authorprascle <prascle>
Tue, 15 Mar 2005 16:33:51 +0000 (16:33 +0000)
committerprascle <prascle>
Tue, 15 Mar 2005 16:33:51 +0000 (16:33 +0000)
src/SALOMEGUI/Makefile.in
src/SALOMEGUI/QAD_Desktop.cxx

index d3acbc362e7ce15c251fab2e8f125528c97e74ca..bd8f7efdd3ced587c63d85a9247f393236560ae9 100644 (file)
@@ -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)
index 4a1184355f8dbfda7c7104682fc83f30eb66e039..cbc5a92e784a96c088fbd9e59fc6efcb05c4cce9 100644 (file)
@@ -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" ;