kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'android-platform' 

42f74df6 Add basic Android platform module
This commit is contained in:
Brad King 2014-06-10 09:17:39 -04:00 committed by CMake Topic Stage
parent f1b91a8af6 42f74df6d4
commit 2944bf164e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/Platform/Android.cmake Normal file
View File

@ -0,0 +1,9 @@
include(Platform/Linux)
# 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)
# Android reportedly ignores RPATH, and we cannot predict the install
# location anyway.
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "")

1
Source/cmTarget.cxx
View File

@ -4320,6 +4320,7 @@ void cmTarget::GetLibraryNames(std::string& name,
const char* version = this->GetProperty("VERSION"); const char* version = this->GetProperty("VERSION");
const char* soversion = this->GetProperty("SOVERSION"); const char* soversion = this->GetProperty("SOVERSION");
if(!this->HasSOName(config) || if(!this->HasSOName(config) ||
this->Makefile->IsOn("CMAKE_PLATFORM_NO_VERSIONED_SONAME") ||
this->IsFrameworkOnApple()) this->IsFrameworkOnApple())
{ {
// Versioning is supported only for shared libraries and modules, // Versioning is supported only for shared libraries and modules,