[PY3] Additional SWIG fixes

diff --git a/src/PVServerService/ServiceLoader/CMakeLists.txt b/src/PVServerService/ServiceLoader/CMakeLists.txt
index ee65c52375d812ab1e1fdc276b7291f46d459152..7e5c65ecedcc9bc7ffa8d017e45db031f810e472 100644 (file)
--- a/src/PVServerService/ServiceLoader/CMakeLists.txt
+++ b/src/PVServerService/ServiceLoader/CMakeLists.txt
@@ -58,7 +58,7 @@ INSTALL(TARGETS PVServerServiceLoader EXPORT ${PROJECT_NAME}TargetGroup DESTINAT
 
 # --- SWIG part ---
 SET_SOURCE_FILES_PROPERTIES(${_SWIG} PROPERTIES CPLUSPLUS ON)
-SET_SOURCE_FILES_PROPERTIES(${_SWIG} PROPERTIES SWIG_DEFINITIONS "-shadow")
+SET_SOURCE_FILES_PROPERTIES(${_SWIG} PROPERTIES SWIG_FLAGS "-py3")
 SWIG_ADD_MODULE(PVServer_ServiceLoader python ${_SWIG})
 IF(WIN32)
   SET_TARGET_PROPERTIES(_PVServer_ServiceLoader PROPERTIES DEBUG_OUTPUT_NAME _PVServer_ServiceLoader_d)

diff --git a/src/SALOME_SWIG/CMakeLists.txt b/src/SALOME_SWIG/CMakeLists.txt
index c68378d4b035a0a284af8b0bf120a56acaa1837c..0b3c1a2fe7df80ef797bdf9f158474453c6b3d96 100755 (executable)
--- a/src/SALOME_SWIG/CMakeLists.txt
+++ b/src/SALOME_SWIG/CMakeLists.txt
@@ -49,7 +49,7 @@ INCLUDE_DIRECTORIES(
 
 # swig flags
 SET_SOURCE_FILES_PROPERTIES(libSALOME_Swig.i PROPERTIES CPLUSPLUS ON)
-SET_SOURCE_FILES_PROPERTIES(libSALOME_Swig.i PROPERTIES SWIG_DEFINITIONS "-shadow")
+SET_SOURCE_FILES_PROPERTIES(libSALOME_Swig.i PROPERTIES SWIG_FLAGS "-py3")
 SET_SOURCE_FILES_PROPERTIES(libSALOME_SwigPYTHON_wrap.cxx PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H")
 
 # additional preprocessor / compiler flags