From c26f2fe6c944bd2ae7da03963707811eaddd541d Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 23 Jan 2018 15:36:09 +0100 Subject: [PATCH] Fix build with updated cmake-builder. --- cmake_builder/CMakeLists.txt | 24 ++++++++++++++++++++++++ prepare.py | 6 +++++- submodules/cmake-builder | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 cmake_builder/CMakeLists.txt diff --git a/cmake_builder/CMakeLists.txt b/cmake_builder/CMakeLists.txt new file mode 100644 index 000000000..f226cc583 --- /dev/null +++ b/cmake_builder/CMakeLists.txt @@ -0,0 +1,24 @@ +############################################################################ +# CMakeLists.txt +# Copyright (C) 2017-2018 Belledonne Communications, Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +############################################################################ + +lcb_blacklist_dependencies("libxsd" "soci") # linphone do not need them for the moment + diff --git a/prepare.py b/prepare.py index 7b8d7393a..cf35f4865 100755 --- a/prepare.py +++ b/prepare.py @@ -49,7 +49,11 @@ class IOSTarget(prepare.Target): self.config_file = 'configs/config-ios-' + arch + '.cmake' self.toolchain_file = 'toolchains/toolchain-ios-' + arch + '.cmake' self.output = 'liblinphone-sdk/' + arch + '-apple-darwin.ios' - self.external_source_path = os.path.join(current_path, 'submodules') + self.external_source_path = os.path.join(current_path, 'submodules') + external_builders_path = os.path.join(current_path, 'cmake_builder') + self.additional_args = [ + "-DLINPHONE_BUILDER_EXTERNAL_BUILDERS_PATH=" + external_builders_path + ] class IOSi386Target(IOSTarget): diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 8560844ab..a6fcb1212 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 8560844abe7e5ad04721b23ca01e269cfa57f2bf +Subproject commit a6fcb1212de7e7b86ef339c61910b99419698006