Commit b532b145 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 ec5869fe
...@@ -53,7 +53,7 @@ endif() ...@@ -53,7 +53,7 @@ endif()
if(ANDROID) if(ANDROID)
find_library(FFMPEG_LIBRARIES find_library(FFMPEG_LIBRARIES
NAMES ffmpeg-linphone-${CMAKE_SYSTEM_PROCESSOR} NAMES ffmpeg-linphone-${NDK_ARCHITECTURE}
) )
else() else()
find_library(LIBAVCODEC_LIBRARIES find_library(LIBAVCODEC_LIBRARIES
......
...@@ -103,7 +103,7 @@ if(ENABLE_SHARED) ...@@ -103,7 +103,7 @@ if(ENABLE_SHARED)
add_library(mediastreamer_base SHARED ${MEDIASTREAMER2_HEADER_FILES} ${BASE_SOURCE_FILES_C}) add_library(mediastreamer_base SHARED ${MEDIASTREAMER2_HEADER_FILES} ${BASE_SOURCE_FILES_C})
set_target_properties(mediastreamer_base PROPERTIES LINKER_LANGUAGE C) set_target_properties(mediastreamer_base PROPERTIES LINKER_LANGUAGE C)
if(ANDROID) if(ANDROID)
set_target_properties(mediastreamer_base PROPERTIES OUTPUT_NAME "mediastreamer_base-${CMAKE_SYSTEM_PROCESSOR}") set_target_properties(mediastreamer_base PROPERTIES OUTPUT_NAME "mediastreamer_base-${NDK_ARCHITECTURE}")
else() else()
# Do not version shared library on Android # Do not version shared library on Android
set_target_properties(mediastreamer_base PROPERTIES SOVERSION ${MEDIASTREAMER_SO_VERSION}) set_target_properties(mediastreamer_base PROPERTIES SOVERSION ${MEDIASTREAMER_SO_VERSION})
...@@ -639,7 +639,7 @@ if(ENABLE_SHARED) ...@@ -639,7 +639,7 @@ if(ENABLE_SHARED)
endif() endif()
add_dependencies(mediastreamer_voip ${MS2_VOIP_DEPENDENCIES}) add_dependencies(mediastreamer_voip ${MS2_VOIP_DEPENDENCIES})
if(ANDROID) if(ANDROID)
set_target_properties(mediastreamer_voip PROPERTIES OUTPUT_NAME "mediastreamer_voip-${CMAKE_SYSTEM_PROCESSOR}") set_target_properties(mediastreamer_voip PROPERTIES OUTPUT_NAME "mediastreamer_voip-${NDK_ARCHITECTURE}")
else() else()
# Do not version shared library on Android # Do not version shared library on Android
set_target_properties(mediastreamer_voip PROPERTIES SOVERSION ${MEDIASTREAMER_SO_VERSION}) set_target_properties(mediastreamer_voip PROPERTIES SOVERSION ${MEDIASTREAMER_SO_VERSION})
......
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