Skip to content

GitLab

Commit 60b6c6d2 authored by saubatn's avatar saubatn
Browse files

FIXED (task 481) Missing end tag of XML for CDash suprojects dependencies listing. Now works ! 

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@1537 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 25cbecd7
Hide whitespace changes
Inline Side-by-side
sdk/cmake/modules/macros/CamiTKSubProjectAdd.cmake
View file @ 60b6c6d2
......@@ -26,20 +26,20 @@ macro(camitk_sub_project_add)
if(ADD_SUB_PROJECT_CORELIB)
set(SUB_PROJECT_NAME ${ADD_SUB_PROJECT_CORELIB})
# Add the xml node for this current subproject
set(xml_subproject_corelibraries ${xml_subproject_corelibraries} "\n <SubProject name=\"${SUB_PROJECT_NAME}\">" CACHE INTERNAL "")
set(xml_subproject_corelibraries ${xml_subproject_corelibraries} "\n <SubProject name=\"${SUB_PROJECT_NAME}\">" CACHE INTERNAL "")
foreach(DEPENDENCY ${ADD_SUB_PROJECT_DEPENDENCIES})
set(xml_subproject_corelibraries ${xml_subproject_corelibraries} "\n <Dependency name=\"${DEPENDENCY}\"/>" CACHE INTERNAL "")
set(xml_subproject_corelibraries ${xml_subproject_corelibraries} "\n <Dependency name=\"${DEPENDENCY}\"/>" CACHE INTERNAL "")
endforeach()
set(xml_subproject_corelibraries ${xml_subproject_corelibraries} " </SubProject>" CACHE INTERNAL "")
set(xml_subproject_corelibraries ${xml_subproject_corelibraries} " </SubProject>" CACHE INTERNAL "")
endif()
# LIBRARY
if(ADD_SUB_PROJECT_CEP_LIBRARY)
set(SUB_PROJECT_NAME ${ADD_SUB_PROJECT_CEP_LIBRARY})
# Add the xml node for this current subproject
set(xml_subproject_libraries ${xml_subproject_libraries} "\n <SubProject name=\"${SUB_PROJECT_NAME}\">" CACHE INTERNAL "")
set(xml_subproject_libraries ${xml_subproject_libraries} "\n <SubProject name=\"${SUB_PROJECT_NAME}\">" CACHE INTERNAL "")
foreach(DEPENDENCY ${ADD_SUB_PROJECT_DEPENDENCIES})
set(xml_subproject_libraries ${xml_subproject_libraries} "\n <Dependency name=\"${DEPENDENCY}\"/>" CACHE INTERNAL "")
set(xml_subproject_libraries ${xml_subproject_libraries} "\n <Dependency name=\"${DEPENDENCY}\"/>" CACHE INTERNAL "")
endforeach()
set(xml_subproject_libraries ${xml_subproject_libraries} " </SubProject>" CACHE INTERNAL "")
set(CAMITK_CEP_LIBRARY_TARGETS ${CAMITK_CEP_LIBRARY_TARGETS} ${SUB_PROJECT_NAME} CACHE STRING "List of CamiTK CEP library targets" FORCE)
......@@ -49,9 +49,9 @@ macro(camitk_sub_project_add)
if(ADD_SUB_PROJECT_COMPONENT)
set(SUB_PROJECT_NAME ${ADD_SUB_PROJECT_COMPONENT})
# Add the xml node for this current subproject
set(xml_subproject_components ${xml_subproject_components} "\n <SubProject name=\"${SUB_PROJECT_NAME}\">" CACHE INTERNAL "")
set(xml_subproject_components ${xml_subproject_components} "\n <SubProject name=\"${SUB_PROJECT_NAME}\">" CACHE INTERNAL "")
foreach(DEPENDENCY ${ADD_SUB_PROJECT_DEPENDENCIES})
set(xml_subproject_components ${xml_subproject_components} "\n <Dependency name=\"${DEPENDENCY}\"/>" CACHE INTERNAL "")
set(xml_subproject_components ${xml_subproject_components} "\n <Dependency name=\"${DEPENDENCY}\"/>" CACHE INTERNAL "")
endforeach()
set(xml_subproject_components ${xml_subproject_components} " </SubProject>" CACHE INTERNAL "")
set(CAMITK_COMPONENT_TARGETS ${CAMITK_COMPONENT_TARGETS} ${SUB_PROJECT_NAME} CACHE STRING "List of CamiTK component targets" FORCE)
......@@ -62,13 +62,14 @@ macro(camitk_sub_project_add)
set(SUB_PROJECT_NAME ${ADD_SUB_PROJECT_ACTION})
if(SUB_PROJECT_NAME STREQUAL "action-application")
# Particular case of action-applications
set(xml_subproject_action_application "\n <SubProject name=\"${SUB_PROJECT_NAME}\">" CACHE INTERNAL "")
set(xml_subproject_action_application ${xml_subproject_action_application} "\n <Dependency name=\"library-camitkcore\"/>" CACHE INTERNAL "")
set(xml_subproject_action_application "\n <SubProject name=\"${SUB_PROJECT_NAME}\">" CACHE INTERNAL "")
set(xml_subproject_action_application ${xml_subproject_action_application} "\n <Dependency name=\"library-camitkcore\"/>" CACHE INTERNAL "")
set(xml_subproject_action_application ${xml_subproject_action_application} " </SubProject>" CACHE INTERNAL "")
else()
# Add the xml node for this current subproject
set(xml_subproject_actions ${xml_subproject_actions} "\n <SubProject name=\"${SUB_PROJECT_NAME}\">" CACHE INTERNAL "")
set(xml_subproject_actions ${xml_subproject_actions} "\n <SubProject name=\"${SUB_PROJECT_NAME}\">" CACHE INTERNAL "")
foreach(DEPENDENCY ${ADD_SUB_PROJECT_DEPENDENCIES})
set(xml_subproject_actions ${xml_subproject_actions} "\n <Dependency name=\"${DEPENDENCY}\"/>" CACHE INTERNAL "")
set(xml_subproject_actions ${xml_subproject_actions} "\n <Dependency name=\"${DEPENDENCY}\"/>" CACHE INTERNAL "")
endforeach()
set(xml_subproject_actions ${xml_subproject_actions} " </SubProject>" CACHE INTERNAL "")
endif()
......@@ -79,28 +80,15 @@ macro(camitk_sub_project_add)
if(ADD_SUB_PROJECT_APPLICATION)
set(SUB_PROJECT_NAME ${ADD_SUB_PROJECT_APPLICATION})
# Add the xml node for this current subproject
set(xml_subproject_applications ${xml_subproject_applications} "\n <SubProject name=\"${SUB_PROJECT_NAME}\">" CACHE INTERNAL "")
set(xml_subproject_applications ${xml_subproject_applications} "\n <SubProject name=\"${SUB_PROJECT_NAME}\">" CACHE INTERNAL "")
foreach(DEPENDENCY ${ADD_SUB_PROJECT_DEPENDENCIES})
set(xml_subproject_applications ${xml_subproject_applications} "\n <Dependency name=\"${DEPENDENCY}\"/>" CACHE INTERNAL "")
set(xml_subproject_applications ${xml_subproject_applications} "\n <Dependency name=\"${DEPENDENCY}\"/>" CACHE INTERNAL "")
endforeach()
set(xml_subproject_applications ${xml_subproject_applications} " </SubProject>" CACHE INTERNAL "")
set(xml_subproject_applications ${xml_subproject_applications} " </SubProject>" CACHE INTERNAL "")
set(CAMITK_APPLICATION_TARGETS ${CAMITK_APPLICATION_TARGETS} ${SUB_PROJECT_NAME} CACHE STRING "List of CamiTK applications targets" FORCE)
endif()
# TODO Remove once debugged
# # Create the xml node for this current subproject
# set(xml_subproject "\n <SubProject name=\"${SUB_PROJECT_NAME}\">")
# foreach(DEPENDENCY ${ADD_SUB_PROJECT_DEPENDENCIES})
# set(xml_subproject ${xml_subproject} "\n <Dependency name=\"${DEPENDENCY}\"/>")
# endforeach()
# set(xml_subproject ${xml_subproject} " </SubProject>")
# # Please note that no "\n" character is used, avoiding cmake cache to throw an "Offending entry"
# # At the moment I did not find a way to solve this one.
#
# # Add it to the list of different nodes
# set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject} CACHE INTERNAL "")
# CDash subprojects listing
set(CAMITK_SUBPROJECTS ${CAMITK_SUBPROJECTS} ${SUB_PROJECT_NAME} CACHE INTERNAL "")
endmacro()
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment