Fix of possible target names collisions for sim2doc

* Fixed OpenFLUID CMake module
* Updated build  process of sim2doc in waresdev

(closes #806)

Author: fabrejc

cmake/OpenFLUIDHelpersConfig.cmake.in

@@ -410,15 +410,15 @@ MACRO(OPENFLUID_ADD_SIMULATOR _SIMNAME)
     ARGS "buddy" "sim2doc" "--options=inputcpp=${${_SIMNAME}_SOURCE_DIR}/${_CPP_FOR_DOC},outputdir=${_DOCS_OUTPUT_PATH},pdf=1${_TPL_OPTION}"     
   )
 
-  ADD_CUSTOM_TARGET(doc-pdf DEPENDS "${_DOCS_OUTPUT_PATH}/${${_SIMNAME}_ID}.pdf")    
+  ADD_CUSTOM_TARGET(${${_SIMNAME}_ID}-doc-pdf DEPENDS "${_DOCS_OUTPUT_PATH}/${${_SIMNAME}_ID}.pdf")    
 
   _OPENFLUID_WARE_TRANSLATIONS(${_SIMNAME})
 
   _OPENFLUID_WARE_TESTS(${_SIMNAME} "-p")
 
 
-  ADD_CUSTOM_TARGET(doc-pdf-install
-                    DEPENDS doc-pdf                      
+  ADD_CUSTOM_TARGET(${${_SIMNAME}_ID}-doc-pdf-install
+                    DEPENDS ${${_SIMNAME}_ID}-doc-pdf                      
                     COMMAND "${CMAKE_COMMAND}" "-E" "copy" 
                             "${_DOCS_OUTPUT_PATH}/${${_SIMNAME}_ID}.pdf" "${_OPNFLD_INSTALL_PATH}/${${_SIMNAME}_ID}.pdf")
 

src/openfluid/waresdev/WareSrcContainer.cpp

@@ -502,8 +502,9 @@ unsigned int WareSrcContainer::getBuildJobs() const
 
 QString WareSrcContainer::getGenerateDocTarget() const
 {
-  // build target is "doc-pdf-install" if current build mode is BUILD_WITHINSTALL, "doc-pdf" in other cases
-  return (m_BuildMode == BuildMode::BUILD_WITHINSTALL ? "doc-pdf-install" : "doc-pdf");
+  // build target is "$ID-doc-pdf-install" if current build mode is BUILD_WITHINSTALL, "$ID-doc-pdf" in other cases
+  // wher $ID is the ware ID
+  return QString("%1-%2").arg(m_ID).arg((m_BuildMode == BuildMode::BUILD_WITHINSTALL ? "doc-pdf-install" : "doc-pdf"));
 }