Commit 415c6a4e authored by Ghislain MARY's avatar Ghislain MARY

Use NDK_ARCHITECTURE instead of CMAKE_SYSTEM_PROCESSOR as library name suffix...

Use NDK_ARCHITECTURE instead of CMAKE_SYSTEM_PROCESSOR as library name suffix when building for Android.
parent eeebd4aa
......@@ -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)
......
......@@ -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})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment