Commit d6dd6317 authored by saubatn's avatar saubatn
Browse files

FIXED Generate correct Project.xml file for external CEP.

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@2003 ec899d31-69d1-42ba-9299-647d76f65fb3
parent ab158530
#! #!
#! @ingroup group_sdk_cmake #! @ingroup group_sdk_cmake
#! #!
#! macro camitk_sub_project_validate validates the xml_subprojects variable by ending its xml tag #! macro camitk_sub_project_validate validates the xml_subprojects variable by ending its xml tag
#! i.e. By adding the closing </Project> xml node, this will close the xml data #! i.e. By adding the closing </Project> xml node, this will close the xml data
#! Then create the '${CMAKE_BINARY_DIR}/Project.xml file #! Then create the '${CMAKE_BINARY_DIR}/Project.xml file
#! Use this file to send to the DashBoard to get the CEP and its subprojects definition #! Use this file to send to the DashBoard to get the CEP and its subprojects definition
#! #!
#! Usage: #! Usage:
...@@ -18,14 +18,15 @@ macro(camitk_sub_project_validate) ...@@ -18,14 +18,15 @@ macro(camitk_sub_project_validate)
"CEP_SET" # possible options "CEP_SET" # possible options
${ARGN} ${ARGN}
) )
# if this a standalone CEP, then write the cdash xml report # if this a standalone CEP, then write the cdash xml report
if(NOT CAMITK_EXTENSION_PROJECT_SET OR ADD_SUB_PROJECT_VALIDATE_CEP_SET) if(NOT CAMITK_EXTENSION_PROJECT_SET OR ADD_SUB_PROJECT_VALIDATE_CEP_SET)
# Add the CDash dependencies in the correct order
# Add the CDash dependencies in the correct order
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_corelibraries}) set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_corelibraries})
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_libraries}) set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_libraries})
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_action_application}) set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_action_application})
# Add camitk opensource CEP specific subprojects # Add camitk opensource CEP specific subprojects
if(${CAMITK_EXTENSION_PROJECT_SET_NAME} MATCHES "camitk-opensource") if(${CAMITK_EXTENSION_PROJECT_SET_NAME} MATCHES "camitk-opensource")
# Add application-testcomponents # Add application-testcomponents
...@@ -43,13 +44,19 @@ macro(camitk_sub_project_validate) ...@@ -43,13 +44,19 @@ macro(camitk_sub_project_validate)
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} " </SubProject>") set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} " </SubProject>")
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_actions}) set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_actions})
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_applications}) set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_applications})
# Add packaging source, packaging and api_doc target (COMMENTED > let's be frank, those are not compiled anymore on VMs) # Add packaging source, packaging and api_doc target (COMMENTED > let's be frank, those are not compiled anymore on VMs)
# set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n <SubProject name=\"package-source\">\n </SubProject>") # set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n <SubProject name=\"package-source\">\n </SubProject>")
# set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n <SubProject name=\"package\">\n </SubProject>") # set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n <SubProject name=\"package\">\n </SubProject>")
# set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n <SubProject name=\"apidoc\">\n </SubProject>") # set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n <SubProject name=\"apidoc\">\n </SubProject>")
else() # Other external CEP
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_components})
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_actions})
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} ${xml_subproject_applications})
endif() endif()
# Write down the Project.xml file # Write down the Project.xml file
set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n</Project>") set(CAMITK_XML_PROJECT_DESCRIPTION ${CAMITK_XML_PROJECT_DESCRIPTION} "\n</Project>")
set(filename "${CMAKE_BINARY_DIR}/Project.xml") set(filename "${CMAKE_BINARY_DIR}/Project.xml")
......
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