From 2e1eae4e9aa37ece0f23fc90a1ccb741b675bb92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Mon, 6 Apr 2020 19:54:15 +0800 Subject: Generalise toolchain directories Assuming NDK > r18, with toolchains which are standalone by default. --- CMakeLists.txt | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26717b5..504aa61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,19 +17,9 @@ add_library(${PROJECT_NAME} SHARED client.cxx) if (ANDROID) - if (ANDROID_ABI STREQUAL "arm64-v8a") - include_directories(/usr/local/aarch64-linux-android/sysroot/usr/include) - target_link_directories(${PROJECT_NAME} PRIVATE /usr/local/aarch64-linux-android/sysroot/usr/lib) - elseif (ANDROID_ABI STREQUAL "armeabi-v7a") - include_directories(/usr/local/arm-linux-androideabi/sysroot/usr/include) - target_link_directories(${PROJECT_NAME} PRIVATE /usr/local/arm-linux-androideabi/sysroot/usr/lib) - elseif (ANDROID_ABI STREQUAL "x86") - include_directories(/usr/local/i686-linux-android/sysroot/usr/include) - target_link_directories(${PROJECT_NAME} PRIVATE /usr/local/i686-linux-android/sysroot/usr/lib) - elseif (ANDROID_ABI STREQUAL "x86_64") - include_directories(/usr/local/x86_64-linux-android/sysroot/usr/include) - target_link_directories(${PROJECT_NAME} PRIVATE /usr/local/x86_64-linux-android/sysroot/usr/lib) - endif() + include_directories(${CMAKE_SYSROOT}/usr/include) + target_link_directories(${PROJECT_NAME} PRIVATE + ${CMAKE_SYSROOT}/usr/lib/${ANDROID_TOOLCHAIN_NAME}/${ANDROID_NATIVE_API_LEVEL}) endif() target_link_libraries(${PROJECT_NAME} -- cgit v1.2.3