Commit 2b10b7aa authored by Ghislain MARY's avatar Ghislain MARY

Simplify package generation for desktop.

parent 9de99a72
......@@ -149,33 +149,26 @@ if (ENABLE_PACKAGING)
DEPENDS TARGET_linphone_builder
TMP_DIR ${ep_tmp}
BINARY_DIR ${ep_build}
SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/desktop/linphone_package"
DOWNLOAD_COMMAND ""
PATCH_COMMAND "${CMAKE_COMMAND}" "-E" "copy_directory" "${CMAKE_CURRENT_LIST_DIR}/desktop/linphone_package" "<SOURCE_DIR>"
CMAKE_GENERATOR ${CMAKE_GENERATOR}
CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DENABLE_ZRTP:BOOL=${ENABLE_ZRTP}
CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} -DENABLE_ZRTP:BOOL=${ENABLE_ZRTP}
)
endif()
# Mediastreamer SDK packages
if(LINPHONE_BUILDER_TARGET STREQUAL ms2
OR LINPHONE_BUILDER_TARGET STREQUAL ms2-plugins)
if(LINPHONE_BUILDER_TARGET STREQUAL ms2)
set(MS2_PACKAGE_DEPEND_TARGET TARGET_ms2)
else()
set(MS2_PACKAGE_DEPEND_TARGET TARGET_ms2plugins)
endif()
if((LINPHONE_BUILDER_TARGET STREQUAL ms2) OR (LINPHONE_BUILDER_TARGET STREQUAL ms2-plugins))
linphone_builder_apply_flags()
linphone_builder_set_ep_directories(ms2_package)
linphone_builder_expand_external_project_vars()
ExternalProject_Add(TARGET_ms2_package
DEPENDS ${MS2_PACKAGE_DEPEND_TARGET}
DEPENDS TARGET_linphone_builder
TMP_DIR ${ep_tmp}
BINARY_DIR ${ep_build}
SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/desktop/ms2_package"
DOWNLOAD_COMMAND ""
PATCH_COMMAND "${CMAKE_COMMAND}" "-E" "copy_directory" "${CMAKE_CURRENT_LIST_DIR}/desktop/ms2_package" "<SOURCE_DIR>"
CMAKE_GENERATOR ${CMAKE_GENERATOR}
CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DENABLE_ZRTP:BOOL=${ENABLE_ZRTP}
CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DMS2_SOURCE_DIR=${EP_ms2_SOURCE_DIR} -DENABLE_ZRTP:BOOL=${ENABLE_ZRTP}
)
endif()
endif()
......@@ -26,9 +26,6 @@ project(LINPHONE_PACKAGE) # Dummy project
find_package(Linphone REQUIRED)
find_package(Git)
set(LINPHONE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../EP_linphone")
set(LINPHONE_BUILD_DIR "${CMAKE_BINARY_DIR}/../linphone")
if(GIT_EXECUTABLE)
execute_process(
COMMAND ${GIT_EXECUTABLE} describe --always
......
......@@ -26,9 +26,6 @@ project(MS2_PACKAGE) # Dummy project
find_package(Mediastreamer2 REQUIRED)
find_package(Git)
set(MS2_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../EP_ms2")
set(MS2_BUILD_DIR "${CMAKE_BINARY_DIR}/../ms2")
if(GIT_EXECUTABLE)
execute_process(
COMMAND ${GIT_EXECUTABLE} describe --always
......
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