Commit bc4e5df8 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Unbreak Android build: set VERSION/SOVERSION on Android, needed for cmake config

Summary:
With commit faecf23d setting those
properties was disabled. The new cnake config file creation now requires
these properties though, the build fails otherwise.
It is not obvious why those properties should not be set on Android,
with them set the build works fine, the apk installs and Marble Maps
works for me.

Reviewers: sanjibanb, nienhueser, #marble

Reviewed By: nienhueser, #marble

Differential Revision: https://phabricator.kde.org/D2430
parent ae284e74
......@@ -5,10 +5,8 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
)
if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
set(ASTRO_LIB_VERSION "0.17.20")
set(ASTRO_LIB_SOVERSION "1")
endif()
set(ASTRO_LIB_VERSION "0.17.20")
set(ASTRO_LIB_SOVERSION "1")
ADD_DEFINITIONS(-O3)
......@@ -38,16 +36,10 @@ if(WIN32)
TARGET_LINK_LIBRARIES(astro ws2_32 imm32 winmm)
endif(WIN32)
if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
SET_TARGET_PROPERTIES(astro PROPERTIES
VERSION ${ASTRO_LIB_VERSION}
SOVERSION ${ASTRO_LIB_SOVERSION}
)
endif()
set_target_properties(astro PROPERTIES
EXPORT_NAME "Astro"
VERSION ${ASTRO_LIB_VERSION}
SOVERSION ${ASTRO_LIB_SOVERSION}
)
target_include_directories(astro
......
......@@ -421,16 +421,11 @@ if(WIN32)
target_link_libraries(marblewidget LINK_PUBLIC ws2_32 imm32 winmm)
endif(WIN32)
if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
set_target_properties(marblewidget PROPERTIES
VERSION ${MARBLE_LIB_VERSION}
SOVERSION ${MARBLE_ABI_VERSION}
)
endif()
set_target_properties(marblewidget PROPERTIES
EXPORT_NAME "Marble"
OUTPUT_NAME marblewidget-qt5
VERSION ${MARBLE_LIB_VERSION}
SOVERSION ${MARBLE_ABI_VERSION}
COMPILE_FLAGS "-DKML_LAZY_IMP"
)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment