From: rnv Date: Tue, 4 Apr 2017 12:00:31 +0000 (+0300) Subject: Improve swig generation process on Windows platform. X-Git-Tag: Before_multi_study_removal_06072017~2^2^2^2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=729fa0289c6f7ac27743d8f1dcb4ab03e9a27984;p=modules%2Fyacs.git Improve swig generation process on Windows platform. --- diff --git a/src/engine_swig/CMakeLists.txt b/src/engine_swig/CMakeLists.txt index 4c525af2e..8ea750c4b 100644 --- a/src/engine_swig/CMakeLists.txt +++ b/src/engine_swig/CMakeLists.txt @@ -109,6 +109,7 @@ SET(SWIGINCLUDES ${ENGINEINCL} SET(SWIG_MODULE_pilot_EXTRA_DEPS engtypemaps.i ${SWIGINCLUDES}) SWIG_ADD_MODULE(pilot python pilot.i ExecutorSwig.cxx) +SWIG_CHECK_GENERATION(pilot) SET(SWIG_MODULE_pypilot_EXTRA_DEPS pilot.i engtypemaps.i _pilot ${SWIGINCLUDES}) SWIG_ADD_MODULE(pypilot python pypilot.i) diff --git a/src/evalyfx_swig/CMakeLists.txt b/src/evalyfx_swig/CMakeLists.txt index 38cd7b29b..3d7693171 100644 --- a/src/evalyfx_swig/CMakeLists.txt +++ b/src/evalyfx_swig/CMakeLists.txt @@ -54,6 +54,7 @@ SET(_swig_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/evalyfx.py) SWIG_ADD_MODULE(evalyfx python evalyfx.i) SWIG_LINK_LIBRARIES(evalyfx ${_link_LIBRARIES}) +SWIG_CHECK_GENERATION(evalyfx) IF(WIN32) SET_TARGET_PROPERTIES(_evalyfx PROPERTIES DEBUG_OUTPUT_NAME _evalyfx_d) ENDIF(WIN32) diff --git a/src/pmml/pmml_swig/CMakeLists.txt b/src/pmml/pmml_swig/CMakeLists.txt index 39b24d4bb..b2c972765 100755 --- a/src/pmml/pmml_swig/CMakeLists.txt +++ b/src/pmml/pmml_swig/CMakeLists.txt @@ -49,7 +49,7 @@ SET (SWIG_MODULE_PMML_EXTRA_DEPS ${PMML_SWIG_DPYS_FILES} SET_SOURCE_FILES_PROPERTIES(PMMLsalome.i PROPERTIES SWIG_MODULE_NAME PMML) SWIG_ADD_MODULE(PMML python PMMLsalome.i) SWIG_LINK_LIBRARIES(PMML ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} pmmlLib) - +SWIG_CHECK_GENERATION(PMML) # _ABR_ Ensure dependency mechanism on all SWIG files and headers IF(WIN32) diff --git a/src/runtime_swig/CMakeLists.txt b/src/runtime_swig/CMakeLists.txt index abfcdca0a..27e3d41fb 100644 --- a/src/runtime_swig/CMakeLists.txt +++ b/src/runtime_swig/CMakeLists.txt @@ -101,6 +101,7 @@ SET(SWIG_MODULE_SALOMERuntime_EXTRA_DEPS SWIG_ADD_MODULE(SALOMERuntime python SALOMERuntime.i) SWIG_LINK_LIBRARIES(SALOMERuntime ${_link_LIBRARIES}) +SWIG_CHECK_GENERATION(SALOMERuntime) IF(WIN32) SET_TARGET_PROPERTIES(_SALOMERuntime PROPERTIES DEBUG_OUTPUT_NAME _SALOMERuntime_d) ENDIF(WIN32) diff --git a/src/salomegui_swig/CMakeLists.txt b/src/salomegui_swig/CMakeLists.txt index db0ca172a..9d1255437 100644 --- a/src/salomegui_swig/CMakeLists.txt +++ b/src/salomegui_swig/CMakeLists.txt @@ -90,6 +90,7 @@ SET(SWIG_MODULE_libYACS_Swig_EXTRA_DEPS YACSGUI_Swig.hxx) SWIG_ADD_MODULE(libYACS_Swig python libYACS_Swig.i YACSGUI_Swig.cxx) SWIG_LINK_LIBRARIES(libYACS_Swig "${_link_LIBRARIES}") +SWIG_CHECK_GENERATION(libYACS_Swig) IF(WIN32) SET_TARGET_PROPERTIES(_libYACS_Swig PROPERTIES DEBUG_OUTPUT_NAME _libYACS_Swig_d) ENDIF(WIN32) diff --git a/src/yacsloader_swig/CMakeLists.txt b/src/yacsloader_swig/CMakeLists.txt index a2ffe302d..285f6c842 100644 --- a/src/yacsloader_swig/CMakeLists.txt +++ b/src/yacsloader_swig/CMakeLists.txt @@ -91,6 +91,7 @@ SET(SWIG_MODULE_loader_EXTRA_DEPS SWIG_ADD_MODULE(loader python loader.i) SWIG_LINK_LIBRARIES(loader ${_link_LIBRARIES}) +SWIG_CHECK_GENERATION(loader) IF(WIN32) SET_TARGET_PROPERTIES(_loader PROPERTIES DEBUG_OUTPUT_NAME _loader_d) ENDIF(WIN32)