Commit 4f2a7b62 authored by Ghislain MARY's avatar Ghislain MARY

Do not add useless dependencies when building only external source paths.

parent b6405792
......@@ -192,7 +192,6 @@ macro(linphone_builder_add_builder_to_target TARGETNAME BUILDER)
set(_source_dir "${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH}/${SUBDIR}")
if(EXISTS "${_source_dir}")
message(STATUS "${TARGETNAME} depends on external source path ${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH}/${SUBDIR}")
add_dependencies(${TARGETNAME} EP_${BUILDER})
set(_build_from_external_source_path 1)
break()
endif()
......@@ -347,10 +346,10 @@ endmacro()
# the specific file is not defined
function(linphone_builder_configure_file_for_project PROJNAME CMD DEFAULT_CONF_FILE OUTPUT)
if("${EP_${PROJNAME}_${CMD}_COMMAND_SOURCE}" STREQUAL "")
MESSAGE(STATUS "Using default file ${DEFAULT_CONF_FILE} for ${CMD} step of ${PROJNAME}")
message(STATUS "Using default file ${DEFAULT_CONF_FILE} for ${CMD} step of ${PROJNAME}")
configure_file(${DEFAULT_CONF_FILE} ${OUTPUT})
else()
MESSAGE(STATUS "Using specific file ${EP_${PROJNAME}_${CMD}_COMMAND_SOURCE} for ${CMD} step of ${PROJNAME}")
message(STATUS "Using specific file ${EP_${PROJNAME}_${CMD}_COMMAND_SOURCE} for ${CMD} step of ${PROJNAME}")
configure_file(${EP_${PROJNAME}_${CMD}_COMMAND_SOURCE} ${OUTPUT})
endif()
endfunction()
......@@ -365,7 +364,7 @@ macro(linphone_builder_filter_out_inexistent_dependencies PROJNAME)
list(FIND LINPHONE_BUILDER_INCLUDED_BUILDERS ${_dep2} _found)
list(FIND LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS ${_dep2} _external_source_path_found)
message("_dep: ${_dep2} _found: ${_found} _external_source_path_found: ${_external_source_path_found}")
if(_found GREATER -1 OR _external_source_path_found GREATER -1)
if(_found GREATER -1 AND _external_source_path_found EQUAL -1)
list(APPEND _new_deps ${_dep})
endif()
endforeach()
......
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