Commit 52f7e9b9 authored by saubatn's avatar saubatn

FIXED action / components dependencies in macro (-jobs=9 works).

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@741 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 8509f966
......@@ -267,7 +267,8 @@ macro(camitk_application)
foreach(COMPONENT_NEEDED ${${APPLICATION_NAME_CMAKE}_NEEDS_COMPONENT_EXTENSION})
string(TOUPPER ${COMPONENT_NEEDED} COMPONENT_NEEDED_CMAKE)
# if this is not true, then the dependencies is from an external build, do not use add_dependencies
if (CAMITK_COMPONENT_${COMPONENT_NEEDED_CMAKE}_INTERNAL)
if (APPLICATION_${APPLICATION_NAME_CMAKE}_INTERNAL)
# TODO add IMPORTED
add_dependencies(${APPLICATION_TARGET_NAME} component-${COMPONENT_NEEDED})
endif()
endforeach()
......@@ -278,7 +279,7 @@ macro(camitk_application)
foreach(ACTION_NEEDED ${${APPLICATION_NAME_CMAKE}_NEEDS_ACTION_EXTENSION})
string(TOUPPER ${ACTION_NEEDED} ACTION_NEEDED_CMAKE)
# if this is not true, then the dependencies is from an external build, do not use add_dependencies
if (CAMITK_ACTION_${ACTION_NEEDED_CMAKE}_INTERNAL)
if (APPLICATION_${APPLICATION_NAME_CMAKE}_INTERNAL)
# TODO add IMPORTED
add_dependencies(${APPLICATION_NAME_CMAKE} action-${ACTION_NEEDED})
endif()
......
# TODO for all macros:
# TODO - look for CAMITK_ and update
# TODO - look for CMAKE_ and update
#!
#! \addtogroup CamiTKMacros
#!
......@@ -384,7 +381,7 @@ macro(camitk_extension)
foreach(COMPONENT_NEEDED ${${EXTENSION_NAME_CMAKE}_NEEDS_COMPONENT_EXTENSION})
string(TOUPPER ${COMPONENT_NEEDED} COMPONENT_NEEDED_CMAKE)
# if this is not true, then the dependencies is from an external build, do not use add_dependencies
if (CAMITK_COMPONENT_${COMPONENT_NEEDED_CMAKE}_INTERNAL)
if (${TYPE_EXTENSION_CMAKE}_${EXTENSION_NAME_CMAKE}_INTERNAL)
# TODO add IMPORTED
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} component-${COMPONENT_NEEDED})
endif()
......@@ -396,7 +393,7 @@ macro(camitk_extension)
foreach(ACTION_NEEDED ${${EXTENSION_NAME_CMAKE}_NEEDS_ACTION_EXTENSION})
string(TOUPPER ${ACTION_NEEDED} ACTION_NEEDED_CMAKE)
# if this is not true, then the dependencies is from an external build, do not use add_dependencies
if (CAMITK_ACTION_${ACTION_NEEDED_CMAKE}_INTERNAL)
if (${TYPE_EXTENSION_CMAKE}_${EXTENSION_NAME_CMAKE}_INTERNAL)
# TODO add IMPORTED
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} action-${ACTION_NEEDED})
endif()
......
Markdown is supported
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