Commit fdcda525 authored by saubatn's avatar saubatn
Browse files

FIXED normalize EXTERNAL_DEPENDENCIES for all (extension, application, library).

FIXED missing CMakeList in imaging changes.

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@960 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 87bc196e
......@@ -8,7 +8,7 @@ endif()
camitk_extension(
ACTION_EXTENSION
NEEDS_ITK
LIBRARIES ITKBasicFilters ITKCommon ITKIO
EXTERNAL_LIBRARIES ITKBasicFilters ITKCommon ITKIO
CEP_NAME CEP_IMAGING
DESCRIPTION "This action features basic ITK image processing filters"
)
......
......@@ -2,7 +2,7 @@ camitk_extension(
ACTION_EXTENSION
NEEDS_ITK
NEEDS_ACTION_EXTENSION multipicking
LIBRARIES ITKBasicFilters ITKCommon ITKIO
EXTERNAL_LIBRARIES ITKBasicFilters ITKCommon ITKIO
CEP_NAME CEP_IMAGING
DESCRIPTION "This action features basic ITK image processing segmentation algorithms"
)
......@@ -376,7 +376,7 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
# add lib as a camitk library
camitk_library(SHARED
SOURCES ${monitoring_SRCS}
LIBRARIES ${monitoring_LIBRARIES}
EXTERNAL_LIBRARIES ${monitoring_LIBRARIES}
INCLUDE_DIRECTORIES ${monitoring_INCLUDE_DIR}
LINK_DIRECTORIES ${monitoring_link}
NEEDS_LIBXML2
......
......@@ -32,7 +32,7 @@
#! [NEEDS_ACTION_EXTENSION ation1 action2 ...]
#! [ADDITIONAL_SOURCES source.cxx source.cpp ...]
#! [INCLUDE_DIRECTORIES dir1 dir2 ...]
#! [LIBRARIES lib1 lib2 ...]
#! [EXTERNAL_LIBRARIES lib1 lib2 ...]
#! )
#! \endcode
#!
......@@ -47,13 +47,13 @@
#! No CEP_NAME provided will result in default categorization (generic application).
#! \param DESCRIPTION Simple description of the application. Used for packaging presentation for instance.
#! \param INCLUDE_DIRECTORIES additional include directories
#! \param LIBRARIES external libraries to add to the link command
#! \param EXTERNAL_LIBRARIES external libraries to add to the link command
macro(camitk_application)
get_directory_name(${CMAKE_CURRENT_SOURCE_DIR} APPLICATION_NAME)
parse_arguments(${APPLICATION_NAME_CMAKE}
"NEEDS_CEP_LIBRARIES;NEEDS_TOOL;NEEDS_COMPONENT_EXTENSION;NEEDS_ACTION_EXTENSION;ADDITIONAL_SOURCES;CEP_NAME;DESCRIPTION;LIBRARIES;INCLUDE_DIRECTORIES" # possible lists
"NEEDS_CEP_LIBRARIES;NEEDS_TOOL;NEEDS_COMPONENT_EXTENSION;NEEDS_ACTION_EXTENSION;ADDITIONAL_SOURCES;CEP_NAME;DESCRIPTION;EXTERNAL_LIBRARIES;INCLUDE_DIRECTORIES" # possible lists
"DISABLED;NEEDS_ITK;NEEDS_QTXML;NEEDS_XSD;NEEDS_XERCESC;NEEDS_PYTHON" # possible options
${ARGN}
)
......@@ -266,8 +266,8 @@ macro(camitk_application)
# consider additional external libraries (static or shared) for linking
set(EXTERNAL_LIBRARIES)
if(${APPLICATION_NAME_CMAKE}_LIBRARIES)
foreach(EXTERNAL_LIBRARY ${${APPLICATION_NAME_CMAKE}_LIBRARIES})
if(${APPLICATION_NAME_CMAKE}_EXTERNAL_LIBRARIES)
foreach(EXTERNAL_LIBRARY ${${APPLICATION_NAME_CMAKE}_EXTERNAL_LIBRARIES})
if (MSVC)
set(EXTERNAL_LIBRARIES ${EXTERNAL_LIBRARIES}
debug ${EXTERNAL_LIBRARY}${CAMITK_DEBUG_POSTFIX}
......
......@@ -22,7 +22,7 @@
#! [INCLUDE_DIRECTORIES dir1 dir2 ...]
#! [DEFINES flag1 flag2 ...]
#! [EXTERNAL_SOURCES file1 file2 ...]
#! [LIBRARIES lib1 lib2 ...]
#! [EXTERNAL_LIBRARIES lib1 lib2 ...]
#! [HEADERS_TO_INSTALL header1.h header2.h ...]
#! [INSTALL_ALL_HEADERS]
#! [TARGET_NAME non-default-targetname]
......@@ -48,7 +48,7 @@
#! \param EXTERNAL_SOURCES = list of extra source/headers files (external to the current directory)
#! that needed to be added to the SOURCES variable.
#! Note: EXTERNAL_SOURCES are not installed
#! \param LIBRARIES = external libraries to add to the link command
#! \param EXTERNAL_LIBRARIES = external libraries to add to the link command
#! \param HEADERS_TO_INSTALL = list of headers to install, if present this will automatically
#! create an "install-COMPONENT_NAMEcomponent" target, that can be used
#! anywhere else to manage dependencies to this component.
......@@ -68,7 +68,7 @@ macro(camitk_extension)
get_directory_name(${CMAKE_CURRENT_SOURCE_DIR} EXTENSION_NAME)
parse_arguments(${EXTENSION_NAME_CMAKE} #prefix
"NEEDS_TOOL;NEEDS_CEP_LIBRARIES;NEEDS_COMPONENT_EXTENSION;NEEDS_ACTION_EXTENSION;INCLUDE_DIRECTORIES;LIBRARIES;HEADERS_TO_INSTALL;DEFINES;EXTERNAL_SOURCES;TARGET_NAME;CEP_NAME;DESCRIPTION" # possible lists
"NEEDS_TOOL;NEEDS_CEP_LIBRARIES;NEEDS_COMPONENT_EXTENSION;NEEDS_ACTION_EXTENSION;INCLUDE_DIRECTORIES;EXTERNAL_LIBRARIES;HEADERS_TO_INSTALL;DEFINES;EXTERNAL_SOURCES;TARGET_NAME;CEP_NAME;DESCRIPTION" # possible lists
"ACTION_EXTENSION;COMPONENT_EXTENSION;DISABLED;NEEDS_XERCESC;NEEDS_ITK;NEEDS_LIBXML2;NEEDS_XSD;NEEDS_QTXML;NEEDS_OPENCV;NEEDS_IGSTK;INSTALL_ALL_HEADERS;NEEDS_GDCM" # possible options
${ARGN}
)
......@@ -348,8 +348,8 @@ macro(camitk_extension)
# consider additional external libraries (static or shared) for linking
set(EXTERNAL_LIBRARIES)
if(${EXTENSION_NAME_CMAKE}_LIBRARIES)
foreach(EXTERNAL_LIBRARY ${${EXTENSION_NAME_CMAKE}_LIBRARIES})
if(${EXTENSION_NAME_CMAKE}_EXTERNAL_LIBRARIES)
foreach(EXTERNAL_LIBRARY ${${EXTENSION_NAME_CMAKE}_EXTERNAL_LIBRARIES})
if (MSVC)
set(EXTERNAL_LIBRARIES ${EXTERNAL_LIBRARIES}
debug ${EXTERNAL_LIBRARY}${CAMITK_DEBUG_POSTFIX}
......
......@@ -15,7 +15,7 @@
#! camitk_library(
#! SHARED|STATIC
#! SOURCES source1.cpp source1.h...
#! LIBRARIES lib1 lib2...
#! EXTERNAL_LIBRARIES lib1 lib2...
#! [INCLUDE_DIRECTORIES dir1 dir2...]
#! [NEEDS_LIBXML2]
#! [NEEDS_XERCESC]
......@@ -55,7 +55,7 @@ macro(camitk_library)
get_directory_name(${CMAKE_CURRENT_SOURCE_DIR} DEFAULT_LIBRARY_NAME)
parse_arguments(${DEFAULT_LIBRARY_NAME_CMAKE}
"SOURCES;LIBRARIES;INCLUDE_DIRECTORIES;LIBNAME;LINK_DIRECTORIES;HEADERS_TO_INSTALL;CEP_NAME;DESCRIPTION" # possible lists
"SOURCES;EXTERNAL_LIBRARIES;INCLUDE_DIRECTORIES;LIBNAME;LINK_DIRECTORIES;HEADERS_TO_INSTALL;CEP_NAME;DESCRIPTION" # possible lists
"SHARED;STATIC;NEEDS_LIBXML2;NEEDS_XERCESC;NEEDS_XSD;PUBLIC" # possible options
${ARGN}
)
......@@ -129,8 +129,8 @@ macro(camitk_library)
# consider additional external libraries (static or shared) for linking
set(EXTERNAL_LIBRARIES)
if(${DEFAULT_LIBRARY_NAME_CMAKE}_LIBRARIES)
foreach(EXTERNAL_LIBRARY ${${DEFAULT_LIBRARY_NAME_CMAKE}_LIBRARIES})
if(${DEFAULT_LIBRARY_NAME_CMAKE}_EXTERNAL_LIBRARIES)
foreach(EXTERNAL_LIBRARY ${${DEFAULT_LIBRARY_NAME_CMAKE}_EXTERNAL_LIBRARIES})
if (MSVC)
set(EXTERNAL_LIBRARIES ${EXTERNAL_LIBRARIES}
debug ${EXTERNAL_LIBRARY}${CAMITK_DEBUG_POSTFIX}
......
......@@ -141,7 +141,7 @@ file(GLOB HEADERS_UPPERCASE "src/Qt*")
camitk_library(SHARED
SOURCES ${SRCS}
LIBRARIES ${QT_LIBRARIES}
EXTERNAL_LIBRARIES ${QT_LIBRARIES}
PUBLIC #install directly in lib (or bin for Windows).
HEADERS_TO_INSTALL ${HEADERS_H} ${HEADERS_UPPERCASE}
CEP_NAME SDK
......
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