From 415c6a4eec99f78ade5d28dadb9e639d18bc2278 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 20 Jan 2017 11:18:13 +0100 Subject: [PATCH] Use NDK_ARCHITECTURE instead of CMAKE_SYSTEM_PROCESSOR as library name suffix when building for Android. --- coreapi/CMakeLists.txt | 2 +- tester/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt index 0f012bdaa..bb91498d2 100644 --- a/coreapi/CMakeLists.txt +++ b/coreapi/CMakeLists.txt @@ -224,7 +224,7 @@ if(ENABLE_SHARED) if(WIN32 AND CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set_target_properties(linphone PROPERTIES PREFIX "lib") elseif(ANDROID) - set_target_properties(linphone PROPERTIES OUTPUT_NAME "linphone-${CMAKE_SYSTEM_PROCESSOR}") + set_target_properties(linphone PROPERTIES OUTPUT_NAME "linphone-${NDK_ARCHITECTURE}") add_dependencies(linphone linphonecore-jni-header) endif() if(MSVC) diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt index b5c0bc576..187682d6d 100644 --- a/tester/CMakeLists.txt +++ b/tester/CMakeLists.txt @@ -219,7 +219,7 @@ endif() if(ANDROID OR IOS) if(ANDROID) add_library(linphonetester SHARED ${SOURCE_FILES_C}) - set_target_properties(linphonetester PROPERTIES OUTPUT_NAME "linphonetester-${CMAKE_SYSTEM_PROCESSOR}") + set_target_properties(linphonetester PROPERTIES OUTPUT_NAME "linphonetester-${NDK_ARCHITECTURE}") endif() if(IOS) add_library(linphonetester STATIC ${SOURCE_FILES_C})