Commit 9a825fd3 authored by Ghislain MARY's avatar Ghislain MARY

Dissociate building only external source path projects and grouping them in a single project.

parent 4f2a7b62
......@@ -36,6 +36,7 @@ option(LINPHONE_BUILDER_BUILD_DEPENDENCIES "Build the dependencies instead of us
set(LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH "" CACHE STRING "External path to source code that is available.")
set(LINPHONE_BUILDER_DUMMY_LIBRARIES "" CACHE STRING "Dummy libraries to be generated.")
option(LINPHONE_BUILDER_BUILD_ONLY_EXTERNAL_SOURCE_PATH "Build only the code put in external source path." NO)
option(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS "Group external source path builders in a single external project." NO)
# Include macros definition to be used by builders
......
......@@ -600,25 +600,27 @@ function(linphone_builder_add_external_projects)
message("LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS: ${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS}")
foreach(BUILDER ${LINPHONE_BUILDER_INCLUDED_BUILDERS})
list(FIND LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS ${BUILDER} _found)
if(found EQUAL -1)
if(found EQUAL -1 OR NOT LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
linphone_builder_add_external_project(${BUILDER})
endif()
endforeach()
endfunction()
function(linphone_builder_add_builtin_projects)
foreach(BUILDER ${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS})
linphone_builder_add_builtin_project(${BUILDER})
endforeach()
get_target_property(_linphone_deps linphone LINK_LIBRARIES)
get_target_property(_ms2_deps mediastreamer_voip LINK_LIBRARIES)
message("_linphone_deps: ${_linphone_deps}")
message("_ms2_deps: ${_ms2_deps}")
function(linphone_builder_add_grouped_external_source_path_projects)
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS AND LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS)
foreach(BUILDER ${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS})
linphone_builder_add_builtin_project(${BUILDER})
endforeach()
get_target_property(_linphone_deps linphone LINK_LIBRARIES)
get_target_property(_ms2_deps mediastreamer_voip LINK_LIBRARIES)
message("_linphone_deps: ${_linphone_deps}")
message("_ms2_deps: ${_ms2_deps}")
endif()
endfunction()
function(linphone_builder_add_projects)
linphone_builder_add_external_projects()
linphone_builder_add_builtin_projects()
linphone_builder_add_grouped_external_source_path_projects()
endfunction()
macro(linphone_builder_add_dummy_libraries_generation)
......
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