diff options
| author | Michael Karcher <kitware@mkarcher.dialup.fu-berlin.de> | 2023-04-21 16:08:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-04-25 17:48:33 (GMT) |
| commit | f7af10100c034e485970cdff13822675b78eb48e (patch) | |
| tree | 98f866ce1afc99668f180f83839f757fff207117 /Modules/Platform/Android | |
| parent | 850ee280e0bb726771ea14f247ba1524b0c3dd64 (diff) | |
| download | CMake-f7af10100c034e485970cdff13822675b78eb48e.zip CMake-f7af10100c034e485970cdff13822675b78eb48e.tar.gz CMake-f7af10100c034e485970cdff13822675b78eb48e.tar.bz2 | |
VS/Android: Detect full NDK root instead of sysroot
Visual Studio always uses a complete NDK and not a standalone toolchain.
Let CMake handle the NDK and related logic correctly, avoid trying to
find the standalone toolchain version from the unified clang toolchain
in newer NDKs.
Diffstat (limited to 'Modules/Platform/Android')
| -rw-r--r-- | Modules/Platform/Android/VCXProjInspect.vcxproj.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Android/VCXProjInspect.vcxproj.in b/Modules/Platform/Android/VCXProjInspect.vcxproj.in index 6919d2c..71fd214 100644 --- a/Modules/Platform/Android/VCXProjInspect.vcxproj.in +++ b/Modules/Platform/Android/VCXProjInspect.vcxproj.in @@ -29,7 +29,7 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@vcx_platform@'"> <PostBuildEvent> - <Command>%40echo CMAKE_SYSROOT=$(@vcx_sysroot_var@)</Command> + <Command>%40echo CMAKE_ANDROID_NDK=$(VS_NdkRoot)</Command> </PostBuildEvent> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |