Commit 05669580 authored by Ghislain MARY's avatar Ghislain MARY

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

parent a44a86a8
......@@ -98,13 +98,7 @@ if(ENABLE_SHARED)
if(NOT CMAKE_VERSION VERSION_LESS 3.1)
set_target_properties(bctoolbox PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
endif()
if(ANDROID)
if(ENABLE_ARCH_SUFFIX)
set_target_properties(bctoolbox PROPERTIES OUTPUT_NAME "bctoolbox-${CMAKE_ANDROID_ARCH_ABI}")
else()
set_target_properties(bctoolbox PROPERTIES OUTPUT_NAME "bctoolbox")
endif()
else()
if(NOT ANDROID)
# Do not version shared library on Android
set_target_properties(bctoolbox PROPERTIES SOVERSION ${BCTOOLBOX_SO_VERSION})
endif()
......@@ -129,13 +123,7 @@ if(ENABLE_SHARED)
if(WIN32)
target_compile_definitions(bctoolbox-tester PRIVATE "-DBCTBX_EXPORTS")
endif()
if(ANDROID)
if(ENABLE_ARCH_SUFFIX)
set_target_properties(bctoolbox-tester PROPERTIES OUTPUT_NAME "bctoolbox-tester-${CMAKE_ANDROID_ARCH_ABI}")
else()
set_target_properties(bctoolbox-tester PROPERTIES OUTPUT_NAME "bctoolbox-tester")
endif()
else()
if(NOT ANDROID)
# Do not version shared library on Android
set_target_properties(bctoolbox-tester PROPERTIES SOVERSION ${BCTOOLBOXTESTER_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