From 7e344a8f0ce7aa46093bd7c23add2186ffc44d06 Mon Sep 17 00:00:00 2001
From: abn <adrien.bruneton@cea.fr>
Date: Tue, 5 Jul 2016 12:29:27 +0200
Subject: [PATCH] CMake bug fix: improper SWIG dependencies.

---
 src/engine_swig/CMakeLists.txt     |  8 +++++---
 src/runtime_swig/CMakeLists.txt    | 11 +++++------
 src/salomegui_swig/CMakeLists.txt  |  2 +-
 src/yacsloader_swig/CMakeLists.txt |  8 ++++----
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/engine_swig/CMakeLists.txt b/src/engine_swig/CMakeLists.txt
index 5f7d647a1..98838ade0 100644
--- 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 041d22b23..43661cf3e 100644
--- 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 aa0b0902a..790c3a17a 100644
--- 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 a0ea1c38c..6265e24cb 100644
--- 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)
-- 
2.30.2