Merge branch 'master' into gni/adaptation

diff --git a/src/SMESH_SWIG/CMakeLists.txt b/src/SMESH_SWIG/CMakeLists.txt
index 4defb70f76d2f996bc461717c9be226951bfcbe8..b6768f40bd2c5a4d0a59d1b0f6769aebc7049d01 100644 (file)
--- a/src/SMESH_SWIG/CMakeLists.txt
+++ b/src/SMESH_SWIG/CMakeLists.txt
@@ -110,6 +110,8 @@ SET(StdMeshers_SCRIPTS
   StdMeshersBuilder.py
 )
 
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
 SET(SMeshHelper_HEADERS SMeshHelper.h SMeshHelper.i)
 SET(SMeshHelper_SOURCES SMeshHelper.cxx ${SMeshHelper_HEADERS})
 SET_SOURCE_FILES_PROPERTIES(SMeshHelper.i PROPERTIES CPLUSPLUS ON)
@@ -122,6 +124,10 @@ ELSE()
   SWIG_ADD_LIBRARY(SMeshHelper LANGUAGE python SOURCES ${SMeshHelper_SOURCES})
 ENDIF()
 SWIG_LINK_LIBRARIES(SMeshHelper ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} SMESHEngine )
+SWIG_CHECK_GENERATION(SMeshHelper)
+IF(WIN32)
+  SET_TARGET_PROPERTIES(_SMeshHelper PROPERTIES DEBUG_OUTPUT_NAME _SMeshHelper_d)
+ENDIF(WIN32)
 install(TARGETS _SMeshHelper DESTINATION ${SALOME_INSTALL_LIBS})
 install(FILES ${SMeshHelper_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}"  ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_SMeshHelper_REAL_NAME}")