From efb7ca4d37495e0006cbe8fd986ef9d69f2defd9 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 27 Jul 2018 11:56:15 +0200 Subject: [PATCH] fix(linphone_package): do not use useless OPENH264_VERSION --- cmake_builder/additional_steps.cmake | 2 +- cmake_builder/linphone_package/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake_builder/additional_steps.cmake b/cmake_builder/additional_steps.cmake index 51af3ab81..56790d043 100644 --- a/cmake_builder/additional_steps.cmake +++ b/cmake_builder/additional_steps.cmake @@ -61,7 +61,7 @@ if (ENABLE_PACKAGING) SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/linphone_package" DOWNLOAD_COMMAND "" CMAKE_GENERATOR ${CMAKE_GENERATOR} - 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_DESKTOP_DIR=${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DOPENH264_VERSION=${OPENH264_VERSION} -DLINPHONE_BUILDER_SIGNING_IDENTITY=${LINPHONE_BUILDER_SIGNING_IDENTITY} -DAPPLICATION_NAME=${APPLICATION_NAME} -DEXECUTABLE_NAME=${EXECUTABLE_NAME} + 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_DESKTOP_DIR=${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DLINPHONE_BUILDER_SIGNING_IDENTITY=${LINPHONE_BUILDER_SIGNING_IDENTITY} ) endif () endif () diff --git a/cmake_builder/linphone_package/CMakeLists.txt b/cmake_builder/linphone_package/CMakeLists.txt index 6134ab0ec..9720e5d91 100644 --- a/cmake_builder/linphone_package/CMakeLists.txt +++ b/cmake_builder/linphone_package/CMakeLists.txt @@ -23,6 +23,8 @@ cmake_minimum_required(VERSION 3.0) project(LINPHONE_PACKAGE) # Dummy project. +include("${LINPHONE_DESKTOP_DIR}/application_info.cmake") + find_package(Linphone REQUIRED) find_package(Git)