diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-03 16:47:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-08-03 16:47:11 (GMT) |
| commit | 9d09d1a9229e952e94d414ec8cd4313463f6d464 (patch) | |
| tree | 7b32067ee7586b07f5d96502767483b5d016cc72 /Modules | |
| parent | cc08d0872c453fd22f4cbcdfb568bc7339c6b693 (diff) | |
| parent | 68d67c827fceabc22bb0be76f084391659dc9a28 (diff) | |
| download | CMake-9d09d1a9229e952e94d414ec8cd4313463f6d464.zip CMake-9d09d1a9229e952e94d414ec8cd4313463f6d464.tar.gz CMake-9d09d1a9229e952e94d414ec8cd4313463f6d464.tar.bz2 | |
Merge branch 'android-plain-sysroot' into release-3.9
Merge-request: !1101
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Android-Common.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Modules/Platform/Android-Common.cmake b/Modules/Platform/Android-Common.cmake index 5faada3..80a8f41 100644 --- a/Modules/Platform/Android-Common.cmake +++ b/Modules/Platform/Android-Common.cmake @@ -160,13 +160,19 @@ macro(__android_compiler_common lang) # Do not do this for a standalone toolchain because it is already # tied to a specific API version. if(CMAKE_ANDROID_NDK) + if(CMAKE_SYSROOT_COMPILE) + set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}") + else() + set(_cmake_sysroot_compile "${CMAKE_SYSROOT}") + endif() if(NOT CMAKE_ANDROID_NDK_DEPRECATED_HEADERS) list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES - "${CMAKE_SYSROOT_COMPILE}/usr/include" - "${CMAKE_SYSROOT_COMPILE}/usr/include/${CMAKE_ANDROID_ARCH_HEADER_TRIPLE}" + "${_cmake_sysroot_compile}/usr/include" + "${_cmake_sysroot_compile}/usr/include/${CMAKE_ANDROID_ARCH_HEADER_TRIPLE}" ) else() - list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES "${CMAKE_SYSROOT}/usr/include") + list(APPEND CMAKE_${lang}_STANDARD_INCLUDE_DIRECTORIES "${_cmake_sysroot_compile}/usr/include") endif() + unset(_cmake_sysroot_compile) endif() endmacro() |