diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-06 13:33:07 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-06 08:33:25 -0500 |
| commit | d564d0619496612ea174d221a643fba8d1f62538 (patch) | |
| tree | dbb1aad1a7ff48674dd4a07e2a133fbcdd188885 | |
| parent | 809890e3f6bcb1a5def21e2e99a54bb6f38505fc (diff) | |
| parent | 64e2c14c4a2be32bcac53067c4cf00364139e9fe (diff) | |
| download | cmake-d564d0619496612ea174d221a643fba8d1f62538.tar.gz | |
Merge topic 'android-versioned-soname'
64e2c14c4a Android: allow user to enable versioned soname
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3063
| -rw-r--r-- | Modules/Platform/Android.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Modules/Platform/Android.cmake b/Modules/Platform/Android.cmake index 3d69733bb2..f08f84176d 100644 --- a/Modules/Platform/Android.cmake +++ b/Modules/Platform/Android.cmake @@ -2,9 +2,11 @@ include(Platform/Linux) set(ANDROID 1) -# Android has soname, but binary names must end in ".so" so we cannot append -# a version number. Also we cannot portably represent symlinks on the host. -set(CMAKE_PLATFORM_NO_VERSIONED_SONAME 1) +# Conventionally Android does not use versioned soname +# But in modern versions it is acceptable +if(NOT DEFINED CMAKE_PLATFORM_NO_VERSIONED_SONAME) + set(CMAKE_PLATFORM_NO_VERSIONED_SONAME 1) +endif() # Android reportedly ignores RPATH, and we cannot predict the install # location anyway. |