From cbd8d5cc05147f9f059fb3d84893beb9c338d499 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 23 Mar 2017 10:51:52 +0100 Subject: [PATCH] add group able build for qt app --- cmake_builder/linphoneqt.cmake | 1 + linphone-desktop/CMakeLists.txt | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/cmake_builder/linphoneqt.cmake b/cmake_builder/linphoneqt.cmake index 62fc695ef..03e58ecff 100644 --- a/cmake_builder/linphoneqt.cmake +++ b/cmake_builder/linphoneqt.cmake @@ -23,6 +23,7 @@ lcb_external_source_paths("../linphone-desktop") lcb_dependencies("linphone" "ms2plugins") +lcb_groupable(YES) # Add config step for packaging set(LINPHONE_BUILDER_ADDITIONAL_CONFIG_STEPS "${CMAKE_CURRENT_LIST_DIR}/additional_steps.cmake") diff --git a/linphone-desktop/CMakeLists.txt b/linphone-desktop/CMakeLists.txt index c64d890da..e4803d088 100644 --- a/linphone-desktop/CMakeLists.txt +++ b/linphone-desktop/CMakeLists.txt @@ -64,10 +64,18 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_QML_DEBUG -DQT_DECLARAT set(QT5_PACKAGES Core Gui Quick Widgets QuickControls2 Svg LinguistTools Network Concurrent) -find_package(BcToolbox REQUIRED) -find_package(Belcard REQUIRED) -find_package(Linphone REQUIRED) -find_package(LinphoneCxx REQUIRED) +if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) + include("${EP_linphone_CONFIG_DIR}/LinphoneConfig.cmake") + include("${EP_linphone_CONFIG_DIR}/wrappers/cpp/LinphoneCxxConfig.cmake") + include("${EP_bctoolbox_CONFIG_DIR}/BctoolboxConfig.cmake") + include("${EP_belcard_CONFIG_DIR}/BelcardConfig.cmake") +else() + find_package(Linphone REQUIRED) + find_package(LinphoneCxx REQUIRED) + find_package(BcToolbox REQUIRED) + find_package(Belcard REQUIRED) +endif() + set(SOURCES src/app/App.cpp