CMake bug fix: improper SWIG dependencies.

diff --git a/src/engine_swig/CMakeLists.txt b/src/engine_swig/CMakeLists.txt
index 5f7d647a11af3b0fb33d93df863571e1368c9576..98838ade07381ecbda3fa97ffd848b41981b7454 100644 (file)
--- a/src/engine_swig/CMakeLists.txt
+++ b/src/engine_swig/CMakeLists.txt
@@ -161,10 +161,12 @@ SET(ENGINEINCLUDES
 SET(SWIGINCLUDES ${ENGINEINCLUDES} 
                 "${PROJECT_SOURCE_DIR}/src/bases/yacsconfig.h" 
                 "ExecutorSwig.hxx")
-SWIG_ADD_MODULE(pilot   python pilot.i ExecutorSwig.cxx)
+
+SET(SWIG_MODULE_pilot_EXTRA_DEPS engtypemaps.i docengine.i ${SWIGINCLUDES})
+SWIG_ADD_MODULE(pilot python pilot.i ExecutorSwig.cxx)
+
+SET(SWIG_MODULE_pypilot_EXTRA_DEPS pilot.i engtypemaps.i _pilot ${SWIGINCLUDES})
 SWIG_ADD_MODULE(pypilot python pypilot.i)
-ADD_DEPENDENCIES(_pilot pilot.i engtypemaps.i docengine.i ${SWIGINCLUDES})
-ADD_DEPENDENCIES(_pypilot pypilot.i pilot.i engtypemaps.i _pilot ${SWIGINCLUDES})
 
 SWIG_LINK_LIBRARIES(pilot   "${_link_LIBRARIES}")
 SWIG_LINK_LIBRARIES(pypilot "${_link_LIBRARIES}")

diff --git a/src/runtime_swig/CMakeLists.txt b/src/runtime_swig/CMakeLists.txt
index 041d22b238c6b51d70c538f4033f7b38e73732d2..43661cf3e035e1d08adf29a50b41a1bf977e5e93 100644 (file)
--- a/src/runtime_swig/CMakeLists.txt
+++ b/src/runtime_swig/CMakeLists.txt
@@ -93,13 +93,12 @@ SET(SWIGINCLUDES
   ${PROJECT_SOURCE_DIR}/src/runtime/TypeConversions.hxx
   ${PROJECT_SOURCE_DIR}/src/runtime/SalomeOptimizerLoop.hxx
   )
+SET(SWIG_MODULE_SALOMERuntime_EXTRA_DEPS 
+               ${PROJECT_SOURCE_DIR}/src/engine_swig/pilot.i 
+               ${PROJECT_SOURCE_DIR}/src/engine_swig/engtypemaps.i 
+               docruntime.i 
+               ${SWIGINCLUDES})
 SWIG_ADD_MODULE(SALOMERuntime python SALOMERuntime.i)
-ADD_DEPENDENCIES(_SALOMERuntime 
-                  SALOMERuntime.i 
-                  ${PROJECT_SOURCE_DIR}/src/engine_swig/pilot.i 
-                  ${PROJECT_SOURCE_DIR}/src/engine_swig/engtypemaps.i 
-                  docruntime.i 
-                  ${SWIGINCLUDES})
 
 SWIG_LINK_LIBRARIES(SALOMERuntime ${_link_LIBRARIES})
 IF(WIN32)

diff --git a/src/salomegui_swig/CMakeLists.txt b/src/salomegui_swig/CMakeLists.txt
index aa0b0902ae9160bf2f131239afd06a9b75899bd3..790c3a17a9a4d4e9b4f621dc55fd9c3413fd486e 100644 (file)
--- a/src/salomegui_swig/CMakeLists.txt
+++ b/src/salomegui_swig/CMakeLists.txt
@@ -87,8 +87,8 @@ ADD_LIBRARY(YACS_Swig ${YACS_Swig_SOURCES})
 TARGET_LINK_LIBRARIES(YACS_Swig ${_link_LIBRARIES})
 INSTALL(TARGETS YACS_Swig EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
+SET(SWIG_MODULE_libYACS_Swig_EXTRA_DEPS doc.i YACSGUI_Swig.hxx)
 SWIG_ADD_MODULE(libYACS_Swig python libYACS_Swig.i YACSGUI_Swig.cxx)
-ADD_DEPENDENCIES(_libYACS_Swig libYACS_Swig.i doc.i YACSGUI_Swig.hxx)
 
 SWIG_LINK_LIBRARIES(libYACS_Swig "${_link_LIBRARIES}")
 IF(WIN32)

diff --git a/src/yacsloader_swig/CMakeLists.txt b/src/yacsloader_swig/CMakeLists.txt
index a0ea1c38c9d18a643f7e843fb50d4f06a37e800c..6265e24cbbd7934862c045046fc150db9fb695f7 100644 (file)
--- a/src/yacsloader_swig/CMakeLists.txt
+++ b/src/yacsloader_swig/CMakeLists.txt
@@ -83,13 +83,13 @@ SET(SWIGINCLUDES
   ${PROJECT_SOURCE_DIR}/src/yacsloader/xmlParserBase.hxx
   ${PROJECT_SOURCE_DIR}/src/yacsloader/ProcCataLoader.hxx
   )
-SWIG_ADD_MODULE(loader python loader.i)
-ADD_DEPENDENCIES(_loader 
-                  loader.i 
-                  ${PROJECT_SOURCE_DIR}/src/engine_swig/pilot.i 
+
+SET(SWIG_MODULE_loader_EXTRA_DEPS 
+           ${PROJECT_SOURCE_DIR}/src/engine_swig/pilot.i 
                   ${PROJECT_SOURCE_DIR}/src/engine_swig/engtypemaps.i 
                   docyacsloader.i 
                   ${SWIGINCLUDES})
+SWIG_ADD_MODULE(loader python loader.i)
 
 SWIG_LINK_LIBRARIES(loader ${_link_LIBRARIES})
 IF(WIN32)