Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 3289f05b authored by promayon's avatar promayon
Browse files

FIXED linking component/action dependencies from CEP


git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@692 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 526a9176
......@@ -457,8 +457,6 @@ macro(camitk_extension)
set(QT_LIBRARIES_WITH_QTXML)
if(${EXTENSION_NAME_CMAKE}_NEEDS_QTXML)
set (QT_USE_QTXML ON)
find_package(Qt4 REQUIRED)
if(QT_USE_FILE)
......@@ -475,7 +473,7 @@ macro(camitk_extension)
foreach(COMPONENT_NEEDED ${${EXTENSION_NAME_CMAKE}_NEEDS_COMPONENT_EXTENSION})
string(TOUPPER ${COMPONENT_NEEDED} ${COMPONENT_NEEDED}_INTERNAL)
set(COMPONENT_${${COMPONENT_NEEDED}_INTERNAL} ON CACHE BOOL "Required by extension ${EXTENSION_NAME}" FORCE )
set(COMPONENT_EXTENSION_LIBRARIES ${COMPONENT_EXTENSION_LIBRARIES} component-${COMPONENT_NEEDED})
set(COMPONENT_EXTENSION_LIBRARIES ${COMPONENT_EXTENSION_LIBRARIES} ${COMPONENT_NEEDED})
include_directories(${CAMITK_INCLUDE_DIR}/components/${COMPONENT_NEEDED})
endforeach()
endif()
......@@ -486,7 +484,7 @@ macro(camitk_extension)
foreach(ACTION_NEEDED ${${EXTENSION_NAME_CMAKE}_NEEDS_ACTION_EXTENSION})
string(TOUPPER ${ACTION_NEEDED} ${ACTION_NEEDED}_INTERNAL)
set(ACTION_${${ACTION_NEEDED}_INTERNAL} ON CACHE BOOL "Required by extension ${EXTENSION_NAME}" FORCE )
set(ACTION_EXTENSION_LIBRARIES ${ACTION_EXTENSION_LIBRARIES} action-${ACTION_NEEDED})
set(ACTION_EXTENSION_LIBRARIES ${ACTION_EXTENSION_LIBRARIES} ${ACTION_NEEDED})
include_directories(${CAMITK_INCLUDE_DIR}/actions/${ACTION_NEEDED})
endforeach()
endif()
......@@ -527,8 +525,7 @@ macro(camitk_extension)
addSubProject(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} ${CAMITK_CORE_LIB} ${COMPONENT_EXTENSION_LIBRARIES} ${ACTION_EXTENSION_LIBRARIES} ${TOOL_LIBRARIES})
# Set the libraries required to link the target
# An action has to be linked with ${CAMITK_CORE_LIB}. As CAMITK_CORE_LIB is always a DLL/shared lib, there should
# be no symbols loaded multiple times
# An component or action has to be linked with ${CAMITK_CORE_LIB} and with all its dependencies
target_link_libraries(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} ${CAMITK_LIBRARIES} ${QT_LIBRARIES_WITH_QTXML} ${CAMITK_CORE_LIB} ${COMPONENT_EXTENSION_LIBRARIES} ${ACTION_EXTENSION_LIBRARIES} ${ITK_LIBRARIES} ${LIBXML2_LIBRARIES} ${OpenCV_LIBRARIES} ${IGSTK_LIBRARIES} ${XERCESC_LIBRARY} ${TOOL_LIBRARIES} ${${EXTENSION_NAME_CMAKE}_LIBRARIES})
# dependencies to core (only set for internal build)
......
......@@ -122,6 +122,7 @@ macro(camitk_add_test)
# create test output directory
set(CAMITK_TEST_OUTPUT_DIR "${CMAKE_BINARY_DIR}/Testing/Temporary/${CAMITK_TEST_NAME}")
message(STATUS "Creating test output dir ${CAMITK_TEST_OUTPUT_DIR}")
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CAMITK_TEST_OUTPUT_DIR})
# check which test is to be done
......
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