diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-12-03 12:42:09 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-17 09:17:54 -0800 |
| commit | 6439a9b4410fe6c884c1494ded51422a214b5775 (patch) | |
| tree | bfe80c72d72fd201054cbd5e8292ba38fc2befc5 | |
| parent | 70470ffa453482f359f9270ee7909bb161c0fb86 (diff) | |
| download | subsurface-6439a9b4410fe6c884c1494ded51422a214b5775.tar.gz | |
build-system/mobile: force using our own ECM build
If the OS has an older one installed, that is found first and the
build fails. This way we know that ours is used.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | packaging/android/qmake-build.sh | 1 | ||||
| -rwxr-xr-x | scripts/build.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/packaging/android/qmake-build.sh b/packaging/android/qmake-build.sh index b9180836c..fc2c2dfe8 100755 --- a/packaging/android/qmake-build.sh +++ b/packaging/android/qmake-build.sh @@ -341,6 +341,7 @@ for ARCH in $ARCHITECTURES ; do -DCMAKE_C_COMPILER="$CC" \ -DCMAKE_LINKER="$CC" \ -DCMAKE_INSTALL_PREFIX="$PREFIX" \ + -DECM_DIR="$SUBSURFACE_SOURCE"/mobile-widgets/3rdparty/ECM \ "$SUBSURFACE_SOURCE"/mobile-widgets/3rdparty/kirigami make make install diff --git a/scripts/build.sh b/scripts/build.sh index fef234ac5..05921473b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -533,6 +533,7 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do # pull the plasma-mobile components from upstream if building Subsurface-mobile if [ "$SUBSURFACE_EXECUTABLE" = "MobileExecutable" ] ; then bash ./scripts/mobilecomponents.sh + EXTRA_OPTS="$EXTRA_OPTS -DECM_DIR=$SRC/$SRC_DIR/mobile-widgets/3rdparty/ECM" fi mkdir -p "$BUILDDIR" |