Skip to content

GitLab

Commit 1bf69790 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Remove useless options LINPHONE_BUILDER_AUTOTOOLS_ONCE and EP_${PROJNAME}_SOURCE_DIR.

parent c966e207
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 60 deletions
cmake/LinphoneCMakeBuilder.cmake
View file @ 1bf69790
......@@ -26,14 +26,6 @@ set(ep_base ${CMAKE_CURRENT_SOURCE_DIR}/WORK)
set_property(DIRECTORY PROPERTY EP_BASE ${ep_base})
option(LINPHONE_BUILDER_AUTOTOOLS_ONCE "Run configure stage only once for subprojects built with the autotools." OFF)
if(${LINPHONE_BUILDER_AUTOTOOLS_ONCE})
set(LINPHONE_BUILDER_AUTOTOOLS_ONCE "yes")
else(${LINPHONE_BUILDER_AUTOTOOLS_ONCE})
set(LINPHONE_BUILDER_AUTOTOOLS_ONCE "no")
endif(${LINPHONE_BUILDER_AUTOTOOLS_ONCE})
if(${CMAKE_VERBOSE_MAKEFILE})
set(AUTOTOOLS_VERBOSE_MAKEFILE 1)
else(${CMAKE_VERBOSE_MAKEFILE})
......@@ -168,36 +160,21 @@ macro(linphone_builder_set_ep_directories PROJNAME)
endmacro(linphone_builder_set_ep_directories)
macro(linphone_builder_add_cmake_project PROJNAME)
set(EP_${PROJNAME}_SOURCE_DIR "" CACHE PATH "Build ${PROJNAME} from a local source path instead of cloning a repository.")
linphone_builder_set_ep_directories(${PROJNAME})
linphone_builder_apply_extra_flags("${EP_${PROJNAME}_EXTRA_CFLAGS}" "${EP_${PROJNAME}_EXTRA_CXXFLAGS}" "${EP_${PROJNAME}_EXTRA_LDFLAGS}")
linphone_builder_expand_external_project_vars()
if(NOT "${EP_${PROJNAME}_SOURCE_DIR}" STREQUAL "")
ExternalProject_Add(EP_${PROJNAME}
DEPENDS ${EP_${PROJNAME}_DEPENDENCIES}
TMP_DIR ${ep_tmp}
BINARY_DIR ${ep_build}
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}
)
else(NOT "${EP_${PROJNAME}_SOURCE_DIR}" STREQUAL "")
ExternalProject_Add(EP_${PROJNAME}
DEPENDS ${EP_${PROJNAME}_DEPENDENCIES}
TMP_DIR ${ep_tmp}
BINARY_DIR ${ep_build}
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}
)
endif(NOT "${EP_${PROJNAME}_SOURCE_DIR}" STREQUAL "")
ExternalProject_Add(EP_${PROJNAME}
DEPENDS ${EP_${PROJNAME}_DEPENDENCIES}
TMP_DIR ${ep_tmp}
BINARY_DIR ${ep_build}
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}
)
endmacro(linphone_builder_add_cmake_project)
macro(linphone_builder_add_autotools_project PROJNAME)
......@@ -209,30 +186,16 @@ macro(linphone_builder_add_autotools_project PROJNAME)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/builders/${PROJNAME}/build.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/EP_${PROJNAME}_build.sh)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/builders/${PROJNAME}/install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/EP_${PROJNAME}_install.sh)
if(NOT "${EP_${PROJNAME}_SOURCE_DIR}" STREQUAL "")
ExternalProject_Add(EP_${PROJNAME}
DEPENDS ${EP_${PROJNAME}_DEPENDENCIES}
TMP_DIR ${ep_tmp}
BINARY_DIR ${ep_build}
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
)
else(NOT "${EP_${PROJNAME}_SOURCE_DIR}" STREQUAL "")
ExternalProject_Add(EP_${PROJNAME}
DEPENDS ${EP_${PROJNAME}_DEPENDENCIES}
TMP_DIR ${ep_tmp}
BINARY_DIR ${ep_build}
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
)
endif(NOT "${EP_${PROJNAME}_SOURCE_DIR}" STREQUAL "")
ExternalProject_Add(EP_${PROJNAME}
DEPENDS ${EP_${PROJNAME}_DEPENDENCIES}
TMP_DIR ${ep_tmp}
BINARY_DIR ${ep_build}
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
)
endmacro(linphone_builder_add_autotools_project PROJNAME)
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