From da239a341031cae73903c7eca6b06d8c6ab2e782 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 26 Mar 2018 16:11:15 +0000 Subject: [PATCH] Improve "no-ui" target so that it can build with minimum dependencies (no doxygen, no graphviz), and update cmake-builder to enable vp8 to build with neon optims on raspberry pi --- prepare.py | 6 +++++- submodules/cmake-builder | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/prepare.py b/prepare.py index c374676e0..a829b85b4 100755 --- a/prepare.py +++ b/prepare.py @@ -98,7 +98,8 @@ class NoUITarget(prepare.Target): self.external_source_path = os.path.join(current_path, 'submodules') self.packaging_args = [ "-DCMAKE_INSTALL_RPATH=$ORIGIN/../lib", - "-DENABLE_RELATIVE_PREFIX=YES" + "-DENABLE_RELATIVE_PREFIX=YES", + "-DENABLE_CXX_WRAPPER=OFF" ] @@ -178,6 +179,9 @@ class DesktopPreparator(prepare.Preparator): def check_environment(self): ret = prepare.Preparator.check_environment(self) + + if "no-ui" in self.targets: + return ret if platform.system() == 'Windows': ret |= not self.check_is_installed('mingw-get', 'MinGW (https://sourceforge.net/projects/mingw/files/Installer/)') if platform.system() == 'Windows': diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 03ad6f69c..98e97e1e7 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 03ad6f69c2d52158c9f61ebceca9efa82e74aa9c +Subproject commit 98e97e1e73fa5b8d1489518f173ca8124af0a5e2