[Pkg-voip-commits] [bctoolbox] 32/57: Use NDK_ARCHITECTURE instead of CMAKE_SYSTEM_PROCESSOR as library name suffix when building for Android.

[daniel at gnoutcheff.name]

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

gnoutchd-guest pushed a commit to branch debian/sid
in repository bctoolbox.

commit 3a1a056a9bd1c6f8e9a667ff06e0ecab8f7463f6
Author: Ghislain MARY <ghislain.mary at belledonne-communications.com>
Date:   Fri Jan 20 11:11:16 2017 +0100

    Use NDK_ARCHITECTURE instead of CMAKE_SYSTEM_PROCESSOR as library name suffix when building for Android.
---
 src/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2f51ee5..032b206 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -88,7 +88,7 @@ if(ENABLE_SHARED)
 	set_target_properties(bctoolbox PROPERTIES LINKER_LANGUAGE "CXX")
 	set_target_properties(bctoolbox PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
 	if(ANDROID)
-		set_target_properties(bctoolbox PROPERTIES OUTPUT_NAME "bctoolbox-${CMAKE_SYSTEM_PROCESSOR}")
+		set_target_properties(bctoolbox PROPERTIES OUTPUT_NAME "bctoolbox-${NDK_ARCHITECTURE}")
 	else()
 		# Do not version shared library on Android
 		set_target_properties(bctoolbox PROPERTIES SOVERSION ${BCTOOLBOX_SO_VERSION})
@@ -115,7 +115,7 @@ if(ENABLE_SHARED)
 			target_compile_definitions(bctoolbox-tester PRIVATE "-DBCTBX_EXPORTS")
 		endif()
 		if(ANDROID)
-			set_target_properties(bctoolbox-tester PROPERTIES OUTPUT_NAME "bctoolbox-tester-${CMAKE_SYSTEM_PROCESSOR}")
+			set_target_properties(bctoolbox-tester PROPERTIES OUTPUT_NAME "bctoolbox-tester-${NDK_ARCHITECTURE}")
 		else()
 			# Do not version shared library on Android
 			set_target_properties(bctoolbox-tester PROPERTIES SOVERSION ${BCTOOLBOXTESTER_SO_VERSION})

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