Commit b0a1bada authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Clean debug messages.

parent 89246d12
...@@ -192,7 +192,7 @@ macro(linphone_builder_add_builder_to_target TARGETNAME BUILDER) ...@@ -192,7 +192,7 @@ macro(linphone_builder_add_builder_to_target TARGETNAME BUILDER)
foreach(SUBDIR ${EP_${BUILDER}_EXTERNAL_SOURCE_PATHS}) foreach(SUBDIR ${EP_${BUILDER}_EXTERNAL_SOURCE_PATHS})
set(_source_dir "${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH}/${SUBDIR}") set(_source_dir "${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH}/${SUBDIR}")
if(EXISTS "${_source_dir}") if(EXISTS "${_source_dir}")
message(STATUS "${TARGETNAME} depends on external source path ${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH}/${SUBDIR}") #message(" ${TARGETNAME} depends on external source path ${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH}/${SUBDIR}")
set(_build_from_external_source_path 1) set(_build_from_external_source_path 1)
break() break()
endif() endif()
...@@ -200,7 +200,7 @@ macro(linphone_builder_add_builder_to_target TARGETNAME BUILDER) ...@@ -200,7 +200,7 @@ macro(linphone_builder_add_builder_to_target TARGETNAME BUILDER)
if(_build_from_external_source_path) if(_build_from_external_source_path)
list(FIND LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS ${BUILDER} _already_included) list(FIND LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS ${BUILDER} _already_included)
if(_already_included EQUAL -1) if(_already_included EQUAL -1)
message(STATUS "add external source path builder ${BUILDER}") message(" external source path builder ${BUILDER}")
set(EP_${BUILDER}_SOURCE_DIR "${_source_dir}") set(EP_${BUILDER}_SOURCE_DIR "${_source_dir}")
list(APPEND LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS ${BUILDER}) list(APPEND LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS ${BUILDER})
endif() endif()
...@@ -208,12 +208,12 @@ macro(linphone_builder_add_builder_to_target TARGETNAME BUILDER) ...@@ -208,12 +208,12 @@ macro(linphone_builder_add_builder_to_target TARGETNAME BUILDER)
elseif(LINPHONE_BUILDER_BUILD_ONLY_EXTERNAL_SOURCE_PATH) elseif(LINPHONE_BUILDER_BUILD_ONLY_EXTERNAL_SOURCE_PATH)
list(APPEND LINPHONE_BUILDER_INCLUDED_BUILDERS_TO_EXCLUDE ${BUILDER}) list(APPEND LINPHONE_BUILDER_INCLUDED_BUILDERS_TO_EXCLUDE ${BUILDER})
else() else()
message(STATUS "${TARGETNAME} depends on external project EP_${BUILDER}") #message(" ${TARGETNAME} depends on external project EP_${BUILDER}")
add_dependencies(${TARGETNAME} EP_${BUILDER}) add_dependencies(${TARGETNAME} EP_${BUILDER})
endif() endif()
unset(_build_from_external_source_path) unset(_build_from_external_source_path)
else() else()
message(STATUS "${TARGETNAME} depends on external project EP_${BUILDER}") #message(" ${TARGETNAME} depends on external project EP_${BUILDER}")
add_dependencies(${TARGETNAME} EP_${BUILDER}) add_dependencies(${TARGETNAME} EP_${BUILDER})
endif() endif()
endmacro() endmacro()
...@@ -361,14 +361,11 @@ endfunction() ...@@ -361,14 +361,11 @@ endfunction()
macro(linphone_builder_filter_out_inexistent_dependencies PROJNAME) macro(linphone_builder_filter_out_inexistent_dependencies PROJNAME)
if(EP_${PROJNAME}_DEPENDENCIES) if(EP_${PROJNAME}_DEPENDENCIES)
set(_new_deps ) set(_new_deps )
message("EP_${PROJNAME}_DEPENDENCIES: ${EP_${PROJNAME}_DEPENDENCIES}")
message("LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS: ${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS}")
foreach(_dep ${EP_${PROJNAME}_DEPENDENCIES}) foreach(_dep ${EP_${PROJNAME}_DEPENDENCIES})
string(REGEX REPLACE "^EP_" "" _dep2 ${_dep}) string(REGEX REPLACE "^EP_" "" _dep2 ${_dep})
list(FIND LINPHONE_BUILDER_INCLUDED_BUILDERS ${_dep2} _found) list(FIND LINPHONE_BUILDER_INCLUDED_BUILDERS ${_dep2} _found)
list(FIND LINPHONE_BUILDER_INCLUDED_BUILDERS_TO_EXCLUDE ${_dep2} _excluded_found) list(FIND LINPHONE_BUILDER_INCLUDED_BUILDERS_TO_EXCLUDE ${_dep2} _excluded_found)
list(FIND LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS ${_dep2} _external_source_path_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) AND (_excluded_found EQUAL -1) AND ((_external_source_path_found EQUAL -1) OR (NOT EP_${_dep2}_GROUPABLE))) if((_found GREATER -1) AND (_excluded_found EQUAL -1) AND ((_external_source_path_found EQUAL -1) OR (NOT EP_${_dep2}_GROUPABLE)))
list(APPEND _new_deps ${_dep}) list(APPEND _new_deps ${_dep})
endif() endif()
...@@ -376,7 +373,6 @@ macro(linphone_builder_filter_out_inexistent_dependencies PROJNAME) ...@@ -376,7 +373,6 @@ macro(linphone_builder_filter_out_inexistent_dependencies PROJNAME)
unset(_dep) unset(_dep)
unset(_found) unset(_found)
unset(_external_source_path_found) unset(_external_source_path_found)
message("_new_deps: ${_new_deps}")
set(EP_${PROJNAME}_DEPENDENCIES ${_new_deps}) set(EP_${PROJNAME}_DEPENDENCIES ${_new_deps})
unset(_new_deps) unset(_new_deps)
endif() endif()
...@@ -561,7 +557,6 @@ function(linphone_builder_add_external_project PROJNAME) ...@@ -561,7 +557,6 @@ function(linphone_builder_add_external_project PROJNAME)
linphone_builder_filter_out_inexistent_dependencies(${PROJNAME}) linphone_builder_filter_out_inexistent_dependencies(${PROJNAME})
message("EP_${PROJNAME}_DEPENDENCIES: ${EP_${PROJNAME}_DEPENDENCIES}")
ExternalProject_Add(EP_${PROJNAME} ExternalProject_Add(EP_${PROJNAME}
DEPENDS ${EP_${PROJNAME}_DEPENDENCIES} DEPENDS ${EP_${PROJNAME}_DEPENDENCIES}
BINARY_DIR ${ep_build} BINARY_DIR ${ep_build}
...@@ -591,9 +586,7 @@ function(linphone_builder_add_external_project PROJNAME) ...@@ -591,9 +586,7 @@ function(linphone_builder_add_external_project PROJNAME)
endfunction() endfunction()
macro(linphone_builder_add_grouped_external_source_path_project PROJNAME FILENAME) macro(linphone_builder_add_grouped_external_source_path_project PROJNAME FILENAME)
message("linphone_builder_add_grouped_external_source_path_project(${PROJNAME}): ${EP_${PROJNAME}_SOURCE_DIR}")
linphone_builder_filter_out_inexistent_dependencies(${PROJNAME}) linphone_builder_filter_out_inexistent_dependencies(${PROJNAME})
message("EP_${PROJNAME}_DEPENDENCIES: ${EP_${PROJNAME}_DEPENDENCIES}")
file(APPEND "${FILENAME}" "add_subdirectory(\"${EP_${PROJNAME}_SOURCE_DIR}\" \"${LINPHONE_BUILDER_WORK_DIR}/Build/${PROJNAME}\")\n") 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_LINKING_TYPES "${EP_${PROJNAME}_LINKING_TYPE}")
list(APPEND EP_linphone_builder_CMAKE_OPTIONS "${EP_${PROJNAME}_CMAKE_OPTIONS}") list(APPEND EP_linphone_builder_CMAKE_OPTIONS "${EP_${PROJNAME}_CMAKE_OPTIONS}")
...@@ -606,8 +599,6 @@ macro(linphone_builder_add_grouped_external_source_path_project PROJNAME FILENAM ...@@ -606,8 +599,6 @@ macro(linphone_builder_add_grouped_external_source_path_project PROJNAME FILENAM
endmacro() endmacro()
function(linphone_builder_add_external_projects) function(linphone_builder_add_external_projects)
message("LINPHONE_BUILDER_INCLUDED_BUILDERS: ${LINPHONE_BUILDER_INCLUDED_BUILDERS}")
message("LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS: ${LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS}")
foreach(BUILDER ${LINPHONE_BUILDER_INCLUDED_BUILDERS}) foreach(BUILDER ${LINPHONE_BUILDER_INCLUDED_BUILDERS})
list(FIND LINPHONE_BUILDER_INCLUDED_BUILDERS_TO_EXCLUDE ${BUILDER} _excluded_found) list(FIND LINPHONE_BUILDER_INCLUDED_BUILDERS_TO_EXCLUDE ${BUILDER} _excluded_found)
list(FIND LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS ${BUILDER} _external_source_path_found) list(FIND LINPHONE_BUILDER_EXTERNAL_SOURCE_PATH_BUILDERS ${BUILDER} _external_source_path_found)
......
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