summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-12 22:07:37 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-08-13 13:10:56 (GMT)
commitbc4e5df8650eebc8938e077d42cf9110469d451b (patch)
tree97e613ddb01497083852f1e9eb0e4cb3236682cf
parentae284e7446ac2bb5feb7d298f8992425196b6e58 (diff)
Unbreak Android build: set VERSION/SOVERSION on Android, needed for cmake config
Summary: With commit faecf23d253a1b7c275eb56574e50ae26f1e7aca 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
-rw-r--r--src/lib/astro/CMakeLists.txt16
-rw-r--r--src/lib/marble/CMakeLists.txt9
2 files changed, 6 insertions, 19 deletions
diff --git a/src/lib/astro/CMakeLists.txt b/src/lib/astro/CMakeLists.txt
index be20b26..3dbe455 100644
--- a/src/lib/astro/CMakeLists.txt
+++ b/src/lib/astro/CMakeLists.txt
@@ -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
diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
index cd22c4e..6a58d16 100644
--- a/src/lib/marble/CMakeLists.txt
+++ b/src/lib/marble/CMakeLists.txt
@@ -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"
)