[PY3] Swig additional fixes

This commit is contained in:
Nicolas Geimer 2017-03-15 15:39:59 +01:00
parent 0b9cd952a3
commit 3a4c128626
3 changed files with 6 additions and 6 deletions

View File

@ -554,7 +554,7 @@ engine = None
doLcc = False doLcc = False
created = False created = False
class geomBuilder(object, GEOM._objref_GEOM_Gen): class geomBuilder(GEOM._objref_GEOM_Gen):
## Enumeration ShapeType as a dictionary. \n ## Enumeration ShapeType as a dictionary. \n
## Topological types of shapes (like Open Cascade types). See GEOM::shape_type for details. ## Topological types of shapes (like Open Cascade types). See GEOM::shape_type for details.
@ -605,7 +605,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
# @ingroup l1_geomBuilder_auxiliary # @ingroup l1_geomBuilder_auxiliary
kind = GEOM.GEOM_IKindOfShape kind = GEOM.GEOM_IKindOfShape
def __new__(cls): def __new__(cls, *args):
global engine global engine
global geom global geom
global doLcc global doLcc
@ -644,12 +644,12 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
#print "return geom 2 ", geom #print "return geom 2 ", geom
return geom return geom
def __init__(self): def __init__(self, *args):
global created global created
#print "-------- geomBuilder __init__ --- ", created, self #print "-------- geomBuilder __init__ --- ", created, self
if not created: if not created:
created = True created = True
GEOM._objref_GEOM_Gen.__init__(self) GEOM._objref_GEOM_Gen.__init__(self, *args)
self.myMaxNbSubShapesAllowed = 0 # auto-publishing is disabled by default self.myMaxNbSubShapesAllowed = 0 # auto-publishing is disabled by default
self.myBuilder = None self.myBuilder = None
self.myStudyId = 0 self.myStudyId = 0

View File

@ -42,7 +42,7 @@ INCLUDE_DIRECTORIES(
# swig flags # swig flags
SET_SOURCE_FILES_PROPERTIES(libGEOM_Swig.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(libGEOM_Swig.i PROPERTIES CPLUSPLUS ON)
SET_SOURCE_FILES_PROPERTIES(libGEOM_Swig.i PROPERTIES SWIG_DEFINITIONS "-shadow") SET_SOURCE_FILES_PROPERTIES(libGEOM_Swig.i PROPERTIES SWIG_FLAGS "-py3")
SET_SOURCE_FILES_PROPERTIES(libGEOM_SwigPYTHON_wrap.cxx PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H") SET_SOURCE_FILES_PROPERTIES(libGEOM_SwigPYTHON_wrap.cxx PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H")
# additional preprocessor / compiler flags # additional preprocessor / compiler flags

View File

@ -52,7 +52,7 @@ SET(_swig_SCRIPTS
# swig flags # swig flags
SET_SOURCE_FILES_PROPERTIES(xao.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(xao.i PROPERTIES CPLUSPLUS ON)
SET_SOURCE_FILES_PROPERTIES(xao.i PROPERTIES SWIG_DEFINITIONS "-shadow") SET_SOURCE_FILES_PROPERTIES(xao.i PROPERTIES SWIG_FLAGS "-py3")
#SET_SOURCE_FILES_PROPERTIES(xao_wrap.cxx PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H") #SET_SOURCE_FILES_PROPERTIES(xao_wrap.cxx PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H")
# --- rules --- # --- rules ---