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 263df96d authored by Emmanuel Promayon's avatar Emmanuel Promayon
Browse files

Merge branch 'bug-21' into develop

Targets compilation dependency seems broket on Linux
parents 33790401 cf935fff
......@@ -33,7 +33,10 @@ if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/libraries/core/CamiTKVersion.h)
get_git_info(${CMAKE_CURRENT_SOURCE_DIR})
set(CAMITK_VERSION_GIT ".${CAMITK_GIT_COMMIT_COUNT}")
set(CAMITK_SVN_SUBVERSION_FOUND "1")
endif()
else()
set(CAMITK_VERSION_GIT ".git")
set(CAMITK_SVN_SUBVERSION_FOUND "0")
endif()
else()
set(CAMITK_SVN_SUBVERSION_FOUND "0")
set(CAMITK_SOURCE_PACKAGE_VERSION "1")
......
......@@ -350,7 +350,9 @@ macro(camitk_application)
# 1st CAMITKCORE LIBRARY DEPENDENCY
add_dependencies(${APPLICATION_TARGET_NAME} ${CAMITK_CORE_TARGET_LIB_NAME})
# add the dependency to the core automoc target
set_property(TARGET ${APPLICATION_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${CAMITK_CORE_TARGET_LIB_NAME})
# 2nd COMPONENTS DEPENDENCIES
if(${APPLICATION_NAME_CMAKE}_NEEDS_COMPONENT_EXTENSION)
set(COMPONENTS_DEPENDENCY_LIST "") #use for generating the project.xml file
......@@ -370,9 +372,13 @@ macro(camitk_application)
# CMake / CDash dependencies
if(PACKAGING_NSIS)
add_dependencies(${APPLICATION_TARGET_NAME} component_${COMPONENT_NEEDED})
# add the dependency to the component automoc target
set_property(TARGET ${APPLICATION_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS component_${COMPONENT_NEEDED})
else()
add_dependencies(${APPLICATION_TARGET_NAME} component-${COMPONENT_NEEDED})
set(COMPONENTS_DEPENDENCY_LIST ${COMPONENTS_DEPENDENCY_LIST} component-${COMPONENT_NEEDED})
# add the dependency to the component automoc target
set_property(TARGET ${APPLICATION_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS component-${COMPONENT_NEEDED})
endif()
endforeach()
endif()
......@@ -396,9 +402,13 @@ macro(camitk_application)
# CMake / CDash dependencies
if (PACKAGING_NSIS)
add_dependencies(${APPLICATION_TARGET_NAME} action_${ACTION_NEEDED})
# add the dependency to the action automoc target
set_property(TARGET ${APPLICATION_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS action_${ACTION_NEEDED})
else()
add_dependencies(${APPLICATION_TARGET_NAME} action-${ACTION_NEEDED})
set(ACTIONS_DEPENDENCY_LIST ${ACTIONS_DEPENDENCY_LIST} action-${ACTION_NEEDED})
# add the dependency to the action automoc target
set_property(TARGET ${APPLICATION_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS action-${ACTION_NEEDED})
endif()
endforeach()
endif()
......@@ -425,9 +435,13 @@ macro(camitk_application)
# CMake / CDash dependencies
if (PACKAGING_NSIS)
add_dependencies(${APPLICATION_TARGET_NAME} library_${CEP_LIBRARY_NEEDED})
# add the dependency to the library automoc target
set_property(TARGET ${APPLICATION_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS library_${CEP_LIBRARY_NEEDED})
else()
add_dependencies(${APPLICATION_TARGET_NAME} library-${CEP_LIBRARY_NEEDED})
set(CEP_LIBRARIES_DEPENDENCY_LIST ${CEP_LIBRARIES_DEPENDENCY_LIST} library-${CEP_LIBRARY_NEEDED})
# add the dependency to the library automoc target
set_property(TARGET ${APPLICATION_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS library-${CEP_LIBRARY_NEEDED})
endif()
endforeach()
endif()
......
......@@ -425,6 +425,8 @@ macro(camitk_extension)
# 1st CAMITKCORE LIBRARY DEPENDENCY
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} ${CAMITK_CORE_TARGET_LIB_NAME})
# add the dependency to the core automoc target
set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${CAMITK_CORE_TARGET_LIB_NAME})
# 2nd COMPONENTS DEPENDENCIES
if(${EXTENSION_NAME_CMAKE}_NEEDS_COMPONENT_EXTENSION)
......@@ -445,9 +447,13 @@ macro(camitk_extension)
# CMake / CDash dependencies
if(PACKAGING_NSIS)
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} component_${COMPONENT_NEEDED})
# add the dependency to the component automoc target
set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS component_${COMPONENT_NEEDED})
else()
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} component-${COMPONENT_NEEDED})
set(COMPONENTS_DEPENDENCY_LIST ${COMPONENTS_DEPENDENCY_LIST} component-${COMPONENT_NEEDED})
# add the dependency to the component automoc target
set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS component-${COMPONENT_NEEDED})
endif()
endforeach()
endif()
......@@ -471,9 +477,13 @@ macro(camitk_extension)
# CMake / CDash dependencies
if (PACKAGING_NSIS)
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} action_${ACTION_NEEDED})
# add the dependency to the action automoc target
set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS action_${ACTION_NEEDED})
else()
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} action-${ACTION_NEEDED})
set(ACTIONS_DEPENDENCY_LIST ${ACTIONS_DEPENDENCY_LIST} action-${ACTION_NEEDED})
# add the dependency to the action automoc target
set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS action-${ACTION_NEEDED})
endif()
endforeach()
endif()
......@@ -500,9 +510,13 @@ macro(camitk_extension)
# CMake / CDash dependencies
if (PACKAGING_NSIS)
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} library_${CEP_LIBRARY_NEEDED})
# add the dependency to the library automoc target
set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS library_${CEP_LIBRARY_NEEDED})
else()
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} library-${CEP_LIBRARY_NEEDED})
set(CEP_LIBRARIES_DEPENDENCY_LIST ${CEP_LIBRARIES_DEPENDENCY_LIST} library-${CEP_LIBRARY_NEEDED})
# add the dependency to the library automoc target
set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS library-${CEP_LIBRARY_NEEDED})
endif()
endforeach()
endif()
......@@ -511,20 +525,26 @@ macro(camitk_extension)
# Those projects are used to run unitarian test on ACTION / COMPONENT extensions.
set(APPLICATIONS_DEPENDENCY_LIST "")
if(${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS)
# Add this dependencies for automatically constructing application-testactions components dependencies
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} application-test${TYPE_EXTENSION}s)
set(APPLICATIONS_DEPENDENCY_LIST "application-test${TYPE_EXTENSION}s")
# Add this dependencies for automatically constructing application-testactions components dependencies
# add the dependency to the test application automoc target
set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS application-test${TYPE_EXTENSION}s)
endif()
if((CEP_NAME STREQUAL "SDK") OR (CEP_NAME STREQUAL "modeling") OR (CEP_NAME STREQUAL "imaging"))
# 6th TEST-COMPONENT APPLICATION DEPENDENCY ON THIS COMPONENT
if(${EXTENSION_NAME_CMAKE}_COMPONENT_EXTENSION AND ${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS)
add_dependencies(application-testactions ${COMPONENT_TARGET_NAME})
# add this component automoc target to the dependency of the test application
set_property(TARGET application-testactions APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${COMPONENT_TARGET_NAME})
endif()
# 7th TEST-ACTION APPLICATION DEPENDENCY ON ACTION-APPLICATION
if(${TYPE_EXTENSION_CMAKE}_TARGET_NAME STREQUAL "action-application")
add_dependencies(application-testcomponents action-application)
# add this component automoc target to the dependency of the test application
set_property(TARGET application-testcomponents APPEND PROPERTY AUTOGEN_TARGET_DEPENDS action-application)
endif()
endif()
......
......@@ -379,9 +379,13 @@ macro(camitk_library)
# CMake / CDash dependencies
if(PACKAGING_NSIS)
add_dependencies(${LIBRARY_TARGET_NAME} library_${CEP_LIBRARY_NEEDED})
# add the dependency to the library automoc target
set_property(TARGET ${LIBRARY_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS library_${CEP_LIBRARY_NEEDED})
else()
add_dependencies(${LIBRARY_TARGET_NAME} library-${CEP_LIBRARY_NEEDED})
set(LIBRARIES_DEPENDENCY_LIST ${LIBRARIES_DEPENDENCY_LIST} library-${CEP_LIBRARY_NEEDED})
# add the dependency to the library automoc target
set_property(TARGET ${LIBRARY_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS library-${CEP_LIBRARY_NEEDED})
endif()
endforeach()
endif()
......
......@@ -99,8 +99,12 @@ endif()
if(PACKAGING_NSIS)
add_dependencies(${CAMITK_CORE_LIB_TARGET_NAME} library_qtpropertybrowser)
# add the dependency to the qtpropertybrowser automoc target
set_property(TARGET ${CAMITK_CORE_LIB_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS library_qtpropertybrowser)
else()
add_dependencies(${CAMITK_CORE_LIB_TARGET_NAME} library-qtpropertybrowser)
# add the dependency to the qtpropertybrowser automoc target
set_property(TARGET ${CAMITK_CORE_LIB_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS library-qtpropertybrowser)
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