diff options
| author | montellese <montellese@kodi.tv> | 2015-08-24 22:01:25 +0200 |
|---|---|---|
| committer | montellese <montellese@kodi.tv> | 2015-08-24 22:01:25 +0200 |
| commit | f7a4b471544d0ee1655b15bf7213ebb696e00b0e (patch) | |
| tree | 26fde19d3e450ce24f55332f2c6fb1d579f7eb2b /project | |
| parent | 183b21380ba6ef570fc2a121c9124314e33b5a00 (diff) | |
[binary addons] fix android by using TARGET_LINKER_FILE_NAME instead of TARGET_FILE_NAME
Diffstat (limited to 'project')
| -rw-r--r-- | project/cmake/scripts/common/addon-helpers.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/project/cmake/scripts/common/addon-helpers.cmake b/project/cmake/scripts/common/addon-helpers.cmake index da2d6a3111..a02836a983 100644 --- a/project/cmake/scripts/common/addon-helpers.cmake +++ b/project/cmake/scripts/common/addon-helpers.cmake @@ -45,8 +45,15 @@ macro (build_addon target prefix libs) SET_TARGET_PROPERTIES(${target} PROPERTIES PREFIX "lib") ENDIF(OS STREQUAL "android") + # get the library's location SET(LIBRARY_LOCATION $<TARGET_FILE:${target}>) - SET(LIBRARY_FILENAME $<TARGET_FILE_NAME:${target}>) + # get the library's filename + if("${CORE_SYSTEM_NAME}" STREQUAL "android") + # for android we need the filename without any version numbers + set(LIBRARY_FILENAME $<TARGET_LINKER_FILE_NAME:${target}>) + else() + SET(LIBRARY_FILENAME $<TARGET_FILE_NAME:${target}>) + endif() # if there's an addon.xml.in we need to generate the addon.xml IF(EXISTS ${PROJECT_SOURCE_DIR}/${target}/addon.xml.in) |