Commit c46487ad authored by Ghislain MARY's avatar Ghislain MARY

Add extra ldflags to grouped external source builder.

parent e2744234
......@@ -595,6 +595,7 @@ macro(linphone_builder_add_grouped_external_source_path_project PROJNAME FILENAM
file(APPEND "${FILENAME}" "add_subdirectory(\"${EP_${PROJNAME}_SOURCE_DIR}\" \"${LINPHONE_BUILDER_WORK_DIR}/Build/${PROJNAME}\")\n")
list(APPEND EP_linphone_builder_LINKING_TYPES "${EP_${PROJNAME}_LINKING_TYPE}")
list(APPEND EP_linphone_builder_CMAKE_OPTIONS "${EP_${PROJNAME}_CMAKE_OPTIONS}")
list(APPEND EP_linphone_builder_EXTRA_LDFLAGS "${EP_${PROJNAME}_EXTRA_LDFLAGS}")
list(APPEND EP_linphone_builder_ADDITIONAL_CMAKE_OPTIONS "-DEP_${PROJNAME}_INCLUDE_DIR=${EP_${PROJNAME}_SOURCE_DIR}/include")
list(APPEND EP_linphone_builder_ADDITIONAL_CMAKE_OPTIONS "-DEP_${PROJNAME}_CONFIG_DIR=${LINPHONE_BUILDER_WORK_DIR}/Build/${PROJNAME}")
if(EP_${PROJNAME}_DEPENDENCIES)
......@@ -622,6 +623,7 @@ function(linphone_builder_add_grouped_external_source_path_projects)
file(APPEND "${_linphone_builder_file}" "option(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS \"Group external source path builders.\" ON)\n")
set(EP_linphone_builder_CMAKE_OPTIONS )
set(EP_linphone_builder_LINKING_TYPES )
set(EP_linphone_builder_EXTRA_LDFLAGS )
set(EP_linphone_builder_DEPENDENCIES )
foreach(BUILDER ${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS})
linphone_builder_add_grouped_external_source_path_project(${BUILDER} "${_linphone_builder_file}")
......@@ -635,6 +637,8 @@ function(linphone_builder_add_grouped_external_source_path_projects)
endif()
list(REMOVE_DUPLICATES EP_linphone_builder_CMAKE_OPTIONS)
# TODO: Check for conflicting CMAKE_OPTIONS
list(REMOVE_DUPLICATES EP_linphone_builder_EXTRA_LDFLAGS)
# TODO: Check for conflicting EXTRA_LDFLAGS
list(APPEND EP_linphone_builder_CMAKE_OPTIONS ${EP_linphone_builder_ADDITIONAL_CMAKE_OPTIONS})
linphone_builder_add_external_project("linphone_builder")
add_dependencies(TARGET_linphone_builder EP_linphone_builder)
......
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