[Pkg-voip-commits] [bctoolbox] 29/60: Updated CMakeLists to use ENABLE_ARCH_SUFFIX option
Bernhard Schmidt
berni at moszumanska.debian.org
Sun Oct 15 22:42:25 UTC 2017
This is an automated email from the git hooks/post-receive script.
berni pushed a commit to branch debian/sid
in repository bctoolbox.
commit 1797049a225494b1430108c7eec3d43b35bc3b9e
Author: Sylvain Berfini <sylvain.berfini at belledonne-communications.com>
Date: Tue May 2 17:36:55 2017 +0200
Updated CMakeLists to use ENABLE_ARCH_SUFFIX option
---
src/CMakeLists.txt | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3a51cf1..af5a12e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -90,7 +90,11 @@ if(ENABLE_SHARED)
set_target_properties(bctoolbox PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
endif()
if(ANDROID)
- set_target_properties(bctoolbox PROPERTIES OUTPUT_NAME "bctoolbox-${CMAKE_ANDROID_ARCH_ABI}")
+ 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()
# Do not version shared library on Android
set_target_properties(bctoolbox PROPERTIES SOVERSION ${BCTOOLBOX_SO_VERSION})
@@ -117,7 +121,11 @@ 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_ANDROID_ARCH_ABI}")
+ 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()
# 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
More information about the Pkg-voip-commits
mailing list