Commit 0d051fc4 authored by Emmanuel Promayon's avatar Emmanuel Promayon
Browse files

Merge branch 'bug/fix-additional-test-for-inbuild-target' into 'develop'

FIXED additional test for an action not yet existing is ok if it is current target

See merge request !9
parents d60b494d 9c4815a4
......@@ -74,9 +74,14 @@ macro(camitk_additional_action_test)
endif()
# check if action can be found in (this order) : build dir (CAMITK_BUILD_PRIVATE_LIB_DIR),
# user install (CAMITK_USER_PRIVATE_LIB_DIR, and global install (CAMITK_PRIVATE_LIB_DIR)
# local user install (CAMITK_USER_PRIVATE_LIB_DIR, and global install (CAMITK_PRIVATE_LIB_DIR)
set(ACTION_EXTENSION_PLUGIN_FILE ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${EXTENSION_FILE})
if (NOT EXISTS ${ACTION_EXTENSION_PLUGIN_FILE})
set(ACTION_EXTENSION_TARGET "action-${ACTION_EXTENSION}")
# The action should already be compiled.
# if the action does not yet exists, if there is a target of the current project
# that will build it, then it is ok as well.
# otherwise, it should be already installed locally or globally
if ((NOT EXISTS ${ACTION_EXTENSION_PLUGIN_FILE}) AND (NOT TARGET ${ACTION_EXTENSION_TARGET}))
set(ACTION_EXTENSION_PLUGIN_FILE ${CAMITK_USER_PRIVATE_LIB_DIR}/${EXTENSION_FILE})
if (NOT EXISTS ${ACTION_EXTENSION_PLUGIN_FILE})
set(ACTION_EXTENSION_PLUGIN_FILE ${CAMITK_PRIVATE_LIB_DIR}/${EXTENSION_FILE})
......
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