diff options
| author | ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id> | 2020-04-06 19:54:15 +0800 |
|---|---|---|
| committer | ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id> | 2020-04-06 19:54:15 +0800 |
| commit | 2e1eae4e9aa37ece0f23fc90a1ccb741b675bb92 (patch) | |
| tree | 734ff93f25e93cfec9a0a8029e0366ba3d4c2478 | |
| parent | 905f99a3e38d10bf3902584a0a0cfa1cd9c355ea (diff) | |
Generalise toolchain directories
Assuming NDK > r18, with toolchains which are standalone by default.
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files 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} |