diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-09 13:23:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-09 13:23:50 (GMT) |
| commit | 293d89ce0981bdb09065bc412330b672a1fdf598 (patch) | |
| tree | a59c269fe4518fa2a408e7730191e10a8d9098b5 /Tests/RunCMake/Android/common.cmake | |
| parent | 7c8c28b5caed93a6ba56675d35e81f1f0b56c83f (diff) | |
| parent | d3d98288e27b344560b59c46e54c3dd9e700de40 (diff) | |
| download | CMake-293d89ce0981bdb09065bc412330b672a1fdf598.zip CMake-293d89ce0981bdb09065bc412330b672a1fdf598.tar.gz CMake-293d89ce0981bdb09065bc412330b672a1fdf598.tar.bz2 | |
Merge topic 'android-windows-multi-config'
d3d98288e2 Tests: Ensure that Android tests work for multi-config generators
be9633bc6e Tests: Append .exe suffix to objdump in Android test on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4858
Diffstat (limited to 'Tests/RunCMake/Android/common.cmake')
| -rw-r--r-- | Tests/RunCMake/Android/common.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/Android/common.cmake b/Tests/RunCMake/Android/common.cmake index d96ab86..32412aa 100644 --- a/Tests/RunCMake/Android/common.cmake +++ b/Tests/RunCMake/Android/common.cmake @@ -96,7 +96,7 @@ add_executable(android_c android.c) add_executable(android_cxx android.cxx) add_library(android_cxx_lib SHARED android_lib.cxx) -set(objdump "${CMAKE_CXX_ANDROID_TOOLCHAIN_PREFIX}objdump") +set(objdump "${CMAKE_CXX_ANDROID_TOOLCHAIN_PREFIX}objdump${CMAKE_CXX_ANDROID_TOOLCHAIN_SUFFIX}") if(NOT EXISTS "${objdump}") message(FATAL_ERROR "Expected tool missing:\n ${objdump}") endif() |