Commit f19719de authored by saubatn's avatar saubatn
Browse files

FIXED : Add ADD_ACTION_EXTENSION dependency. Fix missing header from...

FIXED : Add ADD_ACTION_EXTENSION dependency. Fix missing header from Multipicking needed by ITKSegmentation action.

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@193 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 6e7567c3
......@@ -536,13 +536,13 @@ macro(action_extension)
endif()
# Looking for ITK
set(ITK_LIBRARIES "")
if(${ACTION_NAME_CMAKE}_NEEDS_ITK)
set(ITK_LIBRARIES "")
if(${ACTION_NAME_CMAKE}_NEEDS_ITK)
# ITK is required
find_package(ITK REQUIRED)
include(${ITK_USE_FILE})
else()
set(ITK_LIBRARIES "")
else()
set(ITK_LIBRARIES "")
endif()
# Looking for LibXML2.0
......@@ -559,6 +559,7 @@ macro(action_extension)
endif()
endif()
# looking for OpenCV
set(OpenCV_LIBRARIES "")
if(${ACTION_NAME_CMAKE}_NEEDS_OPENCV)
# OpenCV is required
......@@ -567,6 +568,7 @@ macro(action_extension)
set(OpenCV_LIBRARIES "")
endif()
#looking for IGSTK libraries => what is that ?
set(IGSTK_LIBRARIES "")
if(${ACTION_NAME_CMAKE}_NEEDS_IGSTK)
find_package(IGSTK REQUIRED)
......@@ -603,7 +605,7 @@ macro(action_extension)
endif()
set(COMPONENT_EXTENSION_LIBRARIES)
# check for intra-action extension
# check for intra-component extension
if(${ACTION_NAME_CMAKE}_NEEDS_COMPONENT_EXTENSION)
foreach(COMPONENT_NEEDED ${${ACTION_NAME_CMAKE}_NEEDS_COMPONENT_EXTENSION})
string(TOUPPER ${COMPONENT_NEEDED} ${COMPONENT_NEEDED}_INTERNAL)
......@@ -612,6 +614,15 @@ macro(action_extension)
include_directories(${CAMITK_INCLUDE_DIR}/components/${COMPONENT_NEEDED})
endforeach()
endif()
# check for intra-action extension
if(${ACTION_NAME_CMAKE}_NEEDS_ACTION_EXTENSION)
foreach(ACTION_NEEDED ${${ACTION_NAME_CMAKE}_NEEDS_ACTION_EXTENSION})
string(TOUPPER ${ACTION_NEEDED} ${ACTION_NEEDED}_INTERNAL)
set(ACTION_${${ACTION_NEEDED}_INTERNAL} ON CACHE BOOL "Required by action ${ACTION_NAME}" FORCE )
set(ACTION_EXTENSION_LIBRARIES ${ACTION_EXTENSION_LIBRARIES} ${ACTION_NEEDED})
include_directories(${CAMITK_INCLUDE_DIR}/actions/${ACTION_NEEDED})
endforeach()
endif()
set(ACTION_EXTENSION_LIBRARIES)
# check for intra-action extension
......@@ -625,6 +636,7 @@ macro(action_extension)
endif()
# check for target name
set(ACTION_TARGET_NAME action-${ACTION_NAME})
......
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