Commit 33988943 authored by Ghislain MARY's avatar Ghislain MARY

No longer add suffix to the name of the libraries for Android.

parent 0563d0cf
......@@ -53,7 +53,7 @@ endif()
if(ANDROID)
find_library(FFMPEG_LIBRARIES
NAMES ffmpeg-linphone-${CMAKE_ANDROID_ARCH_ABI}
NAMES ffmpeg-linphone
)
else()
find_library(LIBAVCODEC_LIBRARIES
......
......@@ -109,13 +109,7 @@ if(ENABLE_SHARED)
PUBLIC_HEADER "${MEDIASTREAMER2_HEADER_FILES}"
)
endif()
if(ANDROID)
if(ENABLE_ARCH_SUFFIX)
set_target_properties(mediastreamer_base PROPERTIES OUTPUT_NAME "mediastreamer_base-${CMAKE_ANDROID_ARCH_ABI}")
else()
set_target_properties(mediastreamer_base PROPERTIES OUTPUT_NAME "mediastreamer_base")
endif()
else()
if(NOT ANDROID)
# Do not version shared library on Android
set_target_properties(mediastreamer_base PROPERTIES SOVERSION ${MEDIASTREAMER_SO_VERSION})
endif()
......@@ -679,13 +673,7 @@ if(ENABLE_SHARED)
PUBLIC_HEADER "${MEDIASTREAMER2_HEADER_FILES}"
)
endif()
if(ANDROID)
if(ENABLE_ARCH_SUFFIX)
set_target_properties(mediastreamer_voip PROPERTIES OUTPUT_NAME "mediastreamer_voip-${CMAKE_ANDROID_ARCH_ABI}")
else()
set_target_properties(mediastreamer_voip PROPERTIES OUTPUT_NAME "mediastreamer_voip")
endif()
else()
if(NOT ANDROID)
# Do not version shared library on Android
set_target_properties(mediastreamer_voip PROPERTIES SOVERSION ${MEDIASTREAMER_SO_VERSION})
endif()
......
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