Changeset 868fb9d in subsurface


Ignore:
Timestamp:
Jul 5, 2017, 8:43:11 PM (2 weeks ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
bf3cc2f6
Parents:
db8200a
git-author:
Alex Blasche <alexander.blasche@…> (07/05/17 02:26:12)
git-committer:
Dirk Hohndel <dirk@…> (07/05/17 20:43:11)
Message:

Enable building with standard Qt install path layout

In general this patch enables building of subsurface without being
forced to use the official Qt binary packages. This is particularly helpful
when having to debug Qt internals or having to deal with custom patches
on top of the official Qt releases.

The architecture dependent file path layout is only employed by official
Qt binary packages. They are the result of a reordering at package
generation time. If Qt was build for a single architecture, the standard
layout does not add the architecture specific top level patch for the resulting
binaries.

Signed-off-by: Alex Blasche <alexander.blasche@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packaging/android/build.sh

    rdb8200a r868fb9d  
    120120        BUILDCHAIN=i686-linux-android
    121121        OPENSSL_MACHINE=i686
     122fi
     123
     124# Verify Qt install and adjust for single-arch Qt install layout
     125# (e.g. when building Qt from scratch)
     126export QT5_ANDROID_CMAKE
     127if [ -d "${QT5_ANDROID}/android_${QT_ARCH}/lib/cmake" ] ; then
     128        export QT5_ANDROID_CMAKE=$QT5_ANDROID/android_${QT_ARCH}/lib/cmake
     129elif [ -d "${QT5_ANDROID}lib/cmake" ] ; then
     130        export QT5_ANDROID_CMAKE=$QT5_ANDROID/lib/cmake
     131else
     132        echo "Cannot find Qt cmake configuration"
     133        exit 1
    122134fi
    123135
     
    377389        -DNO_USERMANUAL=ON \
    378390        -DFBSUPPORT=OFF \
    379         -DCMAKE_PREFIX_PATH:UNINITIALIZED="$QT5_ANDROID/android_$QT_ARCH/lib/cmake" \
     391        -DCMAKE_PREFIX_PATH:UNINITIALIZED="$QT5_ANDROID_CMAKE" \
    380392        -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
    381393        -DMAKE_TESTS=OFF \
Note: See TracChangeset for help on using the changeset viewer.