Commit 18b6c13e authored by Emmanuel Promayon's avatar Emmanuel Promayon Committed by Jean-Loup Haberbusch
Browse files

Minimal compile set, no dependency to any test

If testing is disable, disable also all dependencies to
the testing applications as well as disabling test
proprerties.
parent 8cf028fd
......@@ -17,6 +17,6 @@ set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_
# a fail to a pass
# This is needed until there is a way to automatically add input ROI without a widget
# and launch the action with this input from the test environment
if(NOT PACKAGING_NSIS)
if(NOT PACKAGING_NSIS AND BUILD_TESTING)
set_tests_properties("action-cropvolume-LEVEL1-15" PROPERTIES WILL_FAIL true)
endif()
......@@ -11,6 +11,6 @@ camitk_extension( ACTION_EXTENSION
# As the Reorient image action, when applied, needs its dialog box initialized, it cannot
# pass this test.
# Remove when action reorient image has been updated consequently
if(NOT PACKAGING_NSIS)
if(NOT PACKAGING_NSIS AND BUILD_TESTING)
set_tests_properties("action-reorientimage-LEVEL1-15" PROPERTIES WILL_FAIL true)
endif()
\ No newline at end of file
......@@ -18,7 +18,7 @@ set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_
# a fail to a pass
# This is needed until there is a way to tell testaction that this action
# needs two mesh in input
if(NOT PACKAGING_NSIS)
if(NOT PACKAGING_NSIS AND BUILD_TESTING)
set_tests_properties("action-meshprocessing-LEVEL1-19" PROPERTIES WILL_FAIL true)
set_tests_properties("action-meshprocessing-LEVEL1-21" PROPERTIES WILL_FAIL true)
endif()
\ No newline at end of file
......@@ -538,7 +538,7 @@ macro(camitk_extension)
# 5th DEPENDENCY ON TESTING APPLICATION
# 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)
if(${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS AND BUILD_TESTING)
# 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")
......@@ -548,14 +548,14 @@ macro(camitk_extension)
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)
if(${EXTENSION_NAME_CMAKE}_COMPONENT_EXTENSION AND ${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS AND BUILD_TESTING)
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")
if(${TYPE_EXTENSION_CMAKE}_TARGET_NAME STREQUAL "action-application" AND BUILD_TESTING)
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)
......@@ -861,7 +861,7 @@ macro(camitk_extension)
# CTEST - COMPONENT TESTS DESCRIPTION #
# #
#########################################################################
if( ${EXTENSION_NAME_CMAKE}_COMPONENT_EXTENSION AND ${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS)
if( ${EXTENSION_NAME_CMAKE}_COMPONENT_EXTENSION AND ${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS AND BUILD_TESTING)
camitk_init_test( ${${EXTENSION_NAME_CMAKE}_TEST_APPLICATION} )
camitk_parse_test_add_separator(EXTENSION_TYPE ${TYPE_EXTENSION} EXTENSION_NAME ${EXTENSION_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