Commit 8406823c authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Use CMAKE_GENERATOR argument of ExternalProject.

parent 40fc592d
......@@ -77,7 +77,6 @@ list(APPEND LINPHONE_BUILDER_EP_VARS
CMAKE_FIND_ROOT_PATH_MODE_INCLUDE:STRING
CMAKE_FIND_ROOT_PATH_MODE_LIBRARY:STRING
CMAKE_FIND_ROOT_PATH_MODE_PROGRAM:STRING
CMAKE_GENERATOR:STRING
CMAKE_INSTALL_PREFIX:PATH
CMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH
CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING
......@@ -159,6 +158,7 @@ macro(linphone_builder_add_cmake_project PROJNAME)
DEPENDS ${EP_${PROJNAME}_DEPENDENCIES}
SOURCE_DIR ${EP_${PROJNAME}_SOURCE_DIR}
PATCH_COMMAND ${EP_${PROJNAME}_PATCH_COMMAND}
CMAKE_GENERATOR ${CMAKE_GENERATOR}
CMAKE_ARGS ${EP_${PROJNAME}_CMAKE_OPTIONS}
CMAKE_CACHE_ARGS ${LINPHONE_BUILDER_EP_ARGS}
)
......@@ -168,6 +168,7 @@ macro(linphone_builder_add_cmake_project PROJNAME)
GIT_REPOSITORY ${EP_${PROJNAME}_GIT_REPOSITORY}
GIT_TAG ${EP_${PROJNAME}_GIT_TAG}
PATCH_COMMAND ${EP_${PROJNAME}_PATCH_COMMAND}
CMAKE_GENERATOR ${CMAKE_GENERATOR}
CMAKE_ARGS ${EP_${PROJNAME}_CMAKE_OPTIONS}
CMAKE_CACHE_ARGS ${LINPHONE_BUILDER_EP_ARGS}
)
......@@ -187,6 +188,7 @@ macro(linphone_builder_add_autotools_project PROJNAME)
DEPENDS ${EP_${PROJNAME}_DEPENDENCIES}
SOURCE_DIR ${EP_${PROJNAME}_SOURCE_DIR}
PATCH_COMMAND ${EP_${PROJNAME}_PATCH_COMMAND}
CMAKE_GENERATOR ${CMAKE_GENERATOR}
CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EP_${PROJNAME}_configure.sh
BUILD_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EP_${PROJNAME}_build.sh
INSTALL_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EP_${PROJNAME}_install.sh
......@@ -198,6 +200,7 @@ macro(linphone_builder_add_autotools_project PROJNAME)
GIT_REPOSITORY ${EP_${PROJNAME}_GIT_REPOSITORY}
GIT_TAG ${EP_${PROJNAME}_GIT_TAG}
PATCH_COMMAND ${EP_${PROJNAME}_PATCH_COMMAND}
CMAKE_GENERATOR ${CMAKE_GENERATOR}
CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EP_${PROJNAME}_configure.sh
BUILD_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EP_${PROJNAME}_build.sh
INSTALL_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/EP_${PROJNAME}_install.sh
......
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