Commit aca7c1a4 authored by Julien Wadel's avatar Julien Wadel

Reduce names

parent de55901a
Pipeline #18263 passed with stage
in 17 minutes and 13 seconds
[submodule "linphone-sdk"]
path = linphone-sdk
url = https://gitlab.linphone.org/BC/public/linphone-sdk.git
[submodule "linphone-app-plugins/contacts/contacts-api"]
path = linphone-app-plugins/contacts/contacts-api
[submodule "plugins/contacts/contacts-api"]
path = plugins/contacts/contacts-api
url = https://gitlab.linphone.org/BC/public/linphone-desktop-plugins/contacts/contacts-api.git
......@@ -173,8 +173,8 @@ 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 all")
ExternalProject_Add(linphone-plugins PREFIX "${CMAKE_BINARY_DIR}/linphoneqt_plugins"
SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app-plugins"
ExternalProject_Add(app-plugins PREFIX "${CMAKE_BINARY_DIR}/app_plugins"
SOURCE_DIR "${CMAKE_SOURCE_DIR}/plugins"
INSTALL_DIR "${APPLICATION_OUTPUT_DIR}"
DEPENDS ${APP_DEPENDS}
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
......@@ -189,10 +189,10 @@ if( NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR
set(AUTO_REGENERATION auto_regeneration)
add_custom_target(${AUTO_REGENERATION} ALL
COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS linphone-plugins)
DEPENDS app-plugins)
else()
message("Adding Linphone Desktop in an IDE-friendly state")
set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app-plugins)
add_subdirectory(${CMAKE_SOURCE_DIR}/plugins)
endif()
Subproject commit 63fbfda55af53381d789cd6dc54fce8d3a834e0d
......@@ -42,7 +42,7 @@ find_library(CONTACTS_PLUGIN_LIBRARY linphoneAppContactsApi HINTS "${CMAKE_INSTA
if(NOT CONTACTS_PLUGIN_LIBRARY)
string(REPLACE ";" "|" PREFIX_PATH "${CMAKE_PREFIX_PATH}")
include(ExternalProject)
ExternalProject_Add("linphone-app-contacts-api" PREFIX "${CMAKE_BINARY_DIR}/contacts-api"
ExternalProject_Add("app-contacts" PREFIX "${CMAKE_BINARY_DIR}/contacts-api"
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contacts-api"
INSTALL_DIR "${CMAKE_INSTALL_PREFIX}"
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
......@@ -55,10 +55,10 @@ if(NOT CONTACTS_PLUGIN_LIBRARY)
foreach(subdir ${SUBDIRS})
message("Adding ${subdir} external plugin")
ExternalProject_Add("linphone-plugin-${subdir}" PREFIX "${CMAKE_BINARY_DIR}/${subdir}"
ExternalProject_Add("app-${subdir}" PREFIX "${CMAKE_BINARY_DIR}/${subdir}"
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${subdir}"
INSTALL_DIR "${CMAKE_INSTALL_PREFIX}"
DEPENDS linphone-app-contacts-api
DEPENDS app-contacts
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
......
Subproject commit 801f962cc133859bde6c9b384f9de3bc3a4c7bfe
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