[Pkg-voip-commits] [bctoolbox] 36/60: No longer add suffix to the name of the library for Android.

[Bernhard Schmidt]

This is an automated email from the git hooks/post-receive script.

berni pushed a commit to branch debian/sid
in repository bctoolbox.

commit 05669580605324014f3c23d5e466859ddbaa05e9
Author: Ghislain MARY <ghislain.mary at belledonne-communications.com>
Date:   Mon May 15 14:33:19 2017 +0200

    No longer add suffix to the name of the library for Android.
---
 src/CMakeLists.txt | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4f58ed1..b56924e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/bctoolbox.git