aboutsummaryrefslogtreecommitdiff
path: root/toolchain/Android.cmake
diff options
context:
space:
mode:
authorVolker Krause <vkrause@kde.org>2018-02-17 10:28:30 +0100
committerVolker Krause <vkrause@kde.org>2018-02-17 12:25:54 +0100
commit16844390dab769404d9762a702c0cbc5d2d018f2 (patch)
tree0f81e58ff9e8cdb20b32aa496939b5c20957a22f /toolchain/Android.cmake
parent30961b0f0c2ceef7d089876ddd5d2347888d46a6 (diff)
downloadextra-cmake-modules-16844390dab769404d9762a702c0cbc5d2d018f2.tar.gz
extra-cmake-modules-16844390dab769404d9762a702c0cbc5d2d018f2.tar.bz2
Fix include path for x86 targets
Summary: ANDROID_TOOLCHAIN is "x86" there, while the include path we want is "i686-linux-android". ANDROID_COMPILER_PREFIX has that value in all cases (for ARM both are the same, so nothing changes there). Reviewers: #build_system, apol Reviewed By: apol Subscribers: apol, dfaure, #frameworks Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D10599
Diffstat (limited to 'toolchain/Android.cmake')
-rw-r--r--toolchain/Android.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake
index 2f595a70..7e0dcaaf 100644
--- a/toolchain/Android.cmake
+++ b/toolchain/Android.cmake
@@ -182,7 +182,7 @@ include_directories(SYSTEM
"${ANDROID_LIBS_ROOT}/include/"
"${ANDROID_LIBS_ROOT}/libs/${ANDROID_ABI}/include"
"${ANDROID_NDK}/sysroot/usr/include"
- "${ANDROID_NDK}/sysroot/usr/include/${ANDROID_TOOLCHAIN}"
+ "${ANDROID_NDK}/sysroot/usr/include/${ANDROID_COMPILER_PREFIX}"
)
# libraries