diff --git a/configs/config-desktop.cmake b/configs/config-desktop.cmake index 119a07e1525386bf9f321c441eaa54a76ad75ffc..b93f5d67f7bb7805916fd899be82a100a2cfe948 100644 --- a/configs/config-desktop.cmake +++ b/configs/config-desktop.cmake @@ -170,7 +170,7 @@ if(ENABLE_PACKAGING) SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/desktop/linphone_package" DOWNLOAD_COMMAND "" 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)) # Mediastreamer SDK packages diff --git a/configs/desktop/linphone_package/CMakeLists.txt b/configs/desktop/linphone_package/CMakeLists.txt index b469d3c67ebe979cd48d5904da10fe3be3651ebc..fb8e9629f37d873680090bf37c9a0815b9289608 100644 --- a/configs/desktop/linphone_package/CMakeLists.txt +++ b/configs/desktop/linphone_package/CMakeLists.txt @@ -148,6 +148,12 @@ if(WIN32) ) 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/" DESTINATION "lib/mediastreamer/plugins" COMPONENT "msopenh264"