Commit 083e1827 authored by Ghislain MARY's avatar Ghislain MARY

Fix packaging with openh264 on Windows.

parent e0127283
...@@ -170,7 +170,7 @@ if(ENABLE_PACKAGING) ...@@ -170,7 +170,7 @@ if(ENABLE_PACKAGING)
SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/desktop/linphone_package" SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/desktop/linphone_package"
DOWNLOAD_COMMAND "" DOWNLOAD_COMMAND ""
CMAKE_GENERATOR ${CMAKE_GENERATOR} CMAKE_GENERATOR ${CMAKE_GENERATOR}
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} -DENABLE_OPENH264:BOOL=${ENABLE_OPENH264} -DOPENH264_VERSION=${EP_openh264_VERSION} CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} -DENABLE_ZRTP:BOOL=${ENABLE_ZRTP} -DENABLE_OPENH264:BOOL=${ENABLE_OPENH264} -DOPENH264_VERSION=${EP_openh264_VERSION}
) )
elseif((LINPHONE_BUILDER_TARGET STREQUAL ms2) OR (LINPHONE_BUILDER_TARGET STREQUAL ms2-plugins)) elseif((LINPHONE_BUILDER_TARGET STREQUAL ms2) OR (LINPHONE_BUILDER_TARGET STREQUAL ms2-plugins))
# Mediastreamer SDK packages # Mediastreamer SDK packages
......
...@@ -148,6 +148,12 @@ if(WIN32) ...@@ -148,6 +148,12 @@ if(WIN32)
) )
if(ENABLE_OPENH264) if(ENABLE_OPENH264)
# Include bunzip2.exe and bzip2.dll to be able to extract the openh264 file downloaded from Cisco
install(DIRECTORY "${TOOLS_DIR}/"
DESTINATION "bin"
COMPONENT "msopenh264"
FILES_MATCHING PATTERN "b*zip2.*"
)
install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/lib/mediastreamer/plugins/" install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/lib/mediastreamer/plugins/"
DESTINATION "lib/mediastreamer/plugins" DESTINATION "lib/mediastreamer/plugins"
COMPONENT "msopenh264" COMPONENT "msopenh264"
......
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