forked from mirrors/nixpkgs
119 lines
5.4 KiB
Diff
119 lines
5.4 KiB
Diff
|
From 08b8b1811a1ad079fa713d19a8cc6bf2dc782bb7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: David P <megver83@parabola.nu>
|
||
|
|
Date: Thu, 26 Nov 2020 15:56:30 -0300
|
||
|
|
Subject: [PATCH 1/2] do not build linphone-sdk
|
||
|
|
|
||
|
|
Signed-off-by: David P <megver83@parabola.nu>
|
||
|
|
---
|
||
|
|
CMakeLists.txt | 61 +------------------
|
||
|
|
.../cmake_builder/additional_steps.cmake | 9 ---
|
||
|
|
2 files changed, 3 insertions(+), 67 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index f7eb05f2..5921ee5b 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -118,7 +118,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}")
|
||
|
|
|
||
|
|
list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}")
|
||
|
|
|
||
|
|
-include(ExternalProject)
|
||
|
|
set(PROJECT_BUILD_COMMAND "")
|
||
|
|
if(CMAKE_BUILD_PARALLEL_LEVEL)
|
||
|
|
list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}")
|
||
|
|
@@ -136,29 +135,8 @@ if(UNIX AND NOT APPLE)
|
||
|
|
set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}")
|
||
|
|
list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}")
|
||
|
|
endif()
|
||
|
|
-ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk"
|
||
|
|
- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk"
|
||
|
|
- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}"
|
||
|
|
- STAMP_DIR "${SDK_BUILD_DIR}/stamp"
|
||
|
|
- BINARY_DIR "${SDK_BUILD_DIR}"
|
||
|
|
- STEP_TARGETS build
|
||
|
|
- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
|
||
|
|
- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time."
|
||
|
|
- LIST_SEPARATOR | # Use the alternate list separator
|
||
|
|
- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
|
||
|
|
- #BUILD_ALWAYS NO #${DO_BUILD}
|
||
|
|
-)
|
||
|
|
-ExternalProject_Add_Step(sdk force_build
|
||
|
|
- COMMENT "Forcing build for 'desktop'"
|
||
|
|
- DEPENDEES configure
|
||
|
|
- DEPENDERS build
|
||
|
|
- ALWAYS 1
|
||
|
|
-)
|
||
|
|
include(FindPkgConfig)
|
||
|
|
|
||
|
|
-set(APP_DEPENDS sdk)
|
||
|
|
-
|
||
|
|
-
|
||
|
|
find_package(Qt5 5.12 COMPONENTS Core REQUIRED)
|
||
|
|
|
||
|
|
if ( NOT Qt5_FOUND )
|
||
|
|
@@ -173,39 +151,6 @@ find_package(Mediastreamer2 CONFIG QUIET)
|
||
|
|
find_package(ortp CONFIG QUIET)
|
||
|
|
|
||
|
|
|
||
|
|
-if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS)
|
||
|
|
- message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install")
|
||
|
|
- ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app"
|
||
|
|
- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app"
|
||
|
|
- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}"
|
||
|
|
- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app"
|
||
|
|
- DEPENDS ${APP_DEPENDS}
|
||
|
|
- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
|
||
|
|
- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be done by external project"
|
||
|
|
- LIST_SEPARATOR | # Use the alternate list separator
|
||
|
|
- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
|
||
|
|
- # ${APP_OPTIONS}
|
||
|
|
- BUILD_ALWAYS ON
|
||
|
|
- )
|
||
|
|
- install(CODE "message(STATUS Running install)")
|
||
|
|
- set(AUTO_REGENERATION auto_regeneration)
|
||
|
|
- add_custom_target(${AUTO_REGENERATION} ALL
|
||
|
|
- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}
|
||
|
|
- DEPENDS linphone-qt)
|
||
|
|
-else()
|
||
|
|
- message("Adding Linphone Desktop in an IDE-friendly state")
|
||
|
|
- set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
|
||
|
|
- add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
|
||
|
|
- add_dependencies(app-library ${APP_DEPENDS})
|
||
|
|
-endif()
|
||
|
|
-ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app"
|
||
|
|
- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app"
|
||
|
|
- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}"
|
||
|
|
- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app"
|
||
|
|
- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
|
||
|
|
-# INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time."
|
||
|
|
- LIST_SEPARATOR | # Use the alternate list separator
|
||
|
|
- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
|
||
|
|
- EXCLUDE_FROM_ALL ON
|
||
|
|
- BUILD_ALWAYS ON
|
||
|
|
-)
|
||
|
|
+message("Adding Linphone Desktop in an IDE-friendly state")
|
||
|
|
+set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
|
||
|
|
+add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
|
||
|
|
diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake
|
||
|
|
index 7f7fd573..a69a04e8 100644
|
||
|
|
--- a/linphone-app/cmake_builder/additional_steps.cmake
|
||
|
|
+++ b/linphone-app/cmake_builder/additional_steps.cmake
|
||
|
|
@@ -54,14 +54,5 @@ if (ENABLE_PACKAGING)
|
||
|
|
linphone_builder_apply_flags()
|
||
|
|
linphone_builder_set_ep_directories(linphone_package)
|
||
|
|
linphone_builder_expand_external_project_vars()
|
||
|
|
- ExternalProject_Add(TARGET_linphone_package
|
||
|
|
- DEPENDS TARGET_linphone_builder
|
||
|
|
- TMP_DIR ${ep_tmp}
|
||
|
|
- BINARY_DIR ${ep_build}
|
||
|
|
- 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} -DLINPHONE_BUILDER_SIGNING_IDENTITY=${LINPHONE_BUILDER_SIGNING_IDENTITY}
|
||
|
|
- )
|
||
|
|
endif ()
|
||
|
|
endif ()
|
||
|
|
--
|
||
|
|
2.29.2
|
||
|
|
|