diff options
| author |  Rolf Eike Beer <eike@sf-mail.de> | 2019-03-04 07:41:00 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-03-05 13:27:54 -0800 |
| commit | aa7f9a18f2fd300fb4adfa5eeb1ebb27b23b7328 (patch) | |
| tree | 1bd06715a4f4ae04b8480c156843e502fd8173a5 /packaging/android | |
| parent | f667129ed9b663dc72158433aff405c23b93d219 (diff) | |
| download | subsurface-aa7f9a18f2fd300fb4adfa5eeb1ebb27b23b7328.tar.gz | |
simplify sed hacking of Qt CMake files
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
Diffstat (limited to 'packaging/android')
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index 424923232..2e5ee6c1c 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -118,7 +118,7 @@ if [ ! -d Qt/"${LATEST_QT}"/android_armv7 ] ; then fi # patch the cmake / Qt5.7.1 incompatibility mentioned above -sed -i 's/set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/# set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/' Qt/"${LATEST_QT}"/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake +sed -i 's/set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)/# &/' Qt/"${LATEST_QT}"/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake if [ ! -z ${PREP_ONLY+x} ] ; then exit 0 |