Commit be3b3fd8 authored by Ghislain MARY's avatar Ghislain MARY

Allow setting a CMake extra generator.

parent 1f209119
...@@ -416,6 +416,15 @@ macro(linphone_builder_set_ep_directories PROJNAME) ...@@ -416,6 +416,15 @@ macro(linphone_builder_set_ep_directories PROJNAME)
endmacro() endmacro()
macro(linphone_builder_set_ep_generator)
if(CMAKE_EXTRA_GENERATOR)
set(ep_generator "${CMAKE_EXTRA_GENERATOR} - ${CMAKE_GENERATOR}")
else()
set(ep_generator "${CMAKE_GENERATOR}")
endif()
endmacro()
macro(linphone_builder_create_autogen_command PROJNAME) macro(linphone_builder_create_autogen_command PROJNAME)
if(EP_${PROJNAME}_USE_AUTOGEN) if(EP_${PROJNAME}_USE_AUTOGEN)
if(EP_${PROJNAME}_CONFIGURE_OPTIONS_PASSED_TO_AUTOGEN) if(EP_${PROJNAME}_CONFIGURE_OPTIONS_PASSED_TO_AUTOGEN)
...@@ -499,6 +508,7 @@ function(linphone_builder_add_external_project PROJNAME) ...@@ -499,6 +508,7 @@ function(linphone_builder_add_external_project PROJNAME)
endif() endif()
linphone_builder_set_ep_directories(${PROJNAME}) linphone_builder_set_ep_directories(${PROJNAME})
linphone_builder_set_ep_generator()
if(NOT EP_${PROJNAME}_DO_NOT_USE_CMAKE_FLAGS) if(NOT EP_${PROJNAME}_DO_NOT_USE_CMAKE_FLAGS)
linphone_builder_apply_cmake_flags_to_autotools_project(${PROJNAME}) linphone_builder_apply_cmake_flags_to_autotools_project(${PROJNAME})
endif() endif()
...@@ -673,7 +683,7 @@ function(linphone_builder_add_external_project PROJNAME) ...@@ -673,7 +683,7 @@ function(linphone_builder_add_external_project PROJNAME)
BINARY_DIR "${ep_build}" BINARY_DIR "${ep_build}"
${DOWNLOAD_SOURCE} ${DOWNLOAD_SOURCE}
PATCH_COMMAND ${EP_${PROJNAME}_PATCH_COMMAND} PATCH_COMMAND ${EP_${PROJNAME}_PATCH_COMMAND}
CMAKE_GENERATOR ${CMAKE_GENERATOR} CMAKE_GENERATOR ${ep_generator}
${BUILD_COMMANDS} ${BUILD_COMMANDS}
) )
...@@ -847,6 +857,7 @@ endfunction() ...@@ -847,6 +857,7 @@ endfunction()
macro(linphone_builder_add_dummy_libraries_generation) macro(linphone_builder_add_dummy_libraries_generation)
if(LINPHONE_BUILDER_DUMMY_LIBRARIES) if(LINPHONE_BUILDER_DUMMY_LIBRARIES)
linphone_builder_set_ep_directories(dummy_libraries) linphone_builder_set_ep_directories(dummy_libraries)
linphone_builder_set_ep_generator()
linphone_builder_expand_external_project_vars() linphone_builder_expand_external_project_vars()
ExternalProject_Add(EP_dummy_libraries ExternalProject_Add(EP_dummy_libraries
DEPENDS TARGET_linphone_builder DEPENDS TARGET_linphone_builder
...@@ -854,7 +865,7 @@ macro(linphone_builder_add_dummy_libraries_generation) ...@@ -854,7 +865,7 @@ macro(linphone_builder_add_dummy_libraries_generation)
BINARY_DIR "${ep_build}" BINARY_DIR "${ep_build}"
SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/cmake/dummy_libraries" SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/cmake/dummy_libraries"
DOWNLOAD_COMMAND "" DOWNLOAD_COMMAND ""
CMAKE_GENERATOR ${CMAKE_GENERATOR} CMAKE_GENERATOR ${ep_generator}
CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DLINPHONE_BUILDER_DUMMY_LIBRARIES=${LINPHONE_BUILDER_DUMMY_LIBRARIES} CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DLINPHONE_BUILDER_DUMMY_LIBRARIES=${LINPHONE_BUILDER_DUMMY_LIBRARIES}
) )
endif() endif()
......
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