diff options
author | Allen Winter <allen.winter@kdab.com> | 2022-10-24 16:33:29 -0400 |
---|---|---|
committer | Allen Winter <allen.winter@kdab.com> | 2022-10-24 16:33:29 -0400 |
commit | 53109947041d28a13d6cfa09602b44a889a89398 (patch) | |
tree | c6017233f14900c813955607c5fefb324f4fc8e6 /src | |
parent | 483711a9508c423710278b640f9fd0aa2f293c35 (diff) | |
parent | fbb64fb96c413ea063b77dcecd3f4c95f2a57883 (diff) | |
download | libical-git-53109947041d28a13d6cfa09602b44a889a89398.tar.gz |
Merge branch '3.0'
Diffstat (limited to 'src')
-rw-r--r-- | src/java/CMakeLists.txt | 11 | ||||
-rw-r--r-- | src/libical-glib/CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/libical/CMakeLists.txt | 20 | ||||
-rw-r--r-- | src/libicalss/CMakeLists.txt | 20 | ||||
-rw-r--r-- | src/libicalvcal/CMakeLists.txt | 10 |
5 files changed, 42 insertions, 29 deletions
diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt index d1dd43d9..459a99d1 100644 --- a/src/java/CMakeLists.txt +++ b/src/java/CMakeLists.txt @@ -30,11 +30,12 @@ set(ical_jni_LIB_SRCS add_library(ical_jni ${LIBRARY_TYPE} ${ical_jni_LIB_SRCS}) target_link_libraries(ical_jni ical_cxx) - -set_target_properties(ical_jni PROPERTIES - VERSION ${LIBICAL_LIB_VERSION_STRING} - SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} -) +if(NOT ANDROID) + set_target_properties(ical_jni PROPERTIES + VERSION ${LIBICAL_LIB_VERSION_STRING} + SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} + ) +endif() install( TARGETS ical_jni EXPORT icalTargets diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt index 967b4b98..232d11d8 100644 --- a/src/libical-glib/CMakeLists.txt +++ b/src/libical-glib/CMakeLists.txt @@ -249,10 +249,12 @@ else() set_target_properties(ical-glib-static PROPERTIES OUTPUT_NAME "ical-glib") endif() endif() -set_target_properties(ical-glib PROPERTIES - VERSION ${LIBICAL_LIB_VERSION_STRING} - SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} -) +if(NOT ANDROID) + set_target_properties(ical-glib PROPERTIES + VERSION ${LIBICAL_LIB_VERSION_STRING} + SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} + ) +endif() set_target_properties(ical-glib PROPERTIES CLEAN_DIRECT_OUTPUT 1) if(NOT SHARED_ONLY AND NOT STATIC_ONLY) set_target_properties(ical-glib-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) diff --git a/src/libical/CMakeLists.txt b/src/libical/CMakeLists.txt index f53413a1..306ca68a 100644 --- a/src/libical/CMakeLists.txt +++ b/src/libical/CMakeLists.txt @@ -311,10 +311,12 @@ else() set_target_properties(ical-static PROPERTIES OUTPUT_NAME "ical") endif() endif() -set_target_properties(ical PROPERTIES - VERSION ${LIBICAL_LIB_VERSION_STRING} - SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} -) +if(NOT ANDROID) + set_target_properties(ical PROPERTIES + VERSION ${LIBICAL_LIB_VERSION_STRING} + SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} + ) +endif() set_target_properties(ical PROPERTIES CLEAN_DIRECT_OUTPUT 1) if(NOT SHARED_ONLY AND NOT STATIC_ONLY) set_target_properties(ical-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) @@ -374,10 +376,12 @@ if(WITH_CXX_BINDINGS) endif() endif() - set_target_properties(ical_cxx PROPERTIES - VERSION ${LIBICAL_LIB_VERSION_STRING} - SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} - ) + if(NOT ANDROID) + set_target_properties(ical_cxx PROPERTIES + VERSION ${LIBICAL_LIB_VERSION_STRING} + SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} + ) + endif() set_target_properties(ical_cxx PROPERTIES CLEAN_DIRECT_OUTPUT 1) if(NOT SHARED_ONLY AND NOT STATIC_ONLY) set_target_properties(ical_cxx-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) diff --git a/src/libicalss/CMakeLists.txt b/src/libicalss/CMakeLists.txt index 1982ddc8..15c4c0ad 100644 --- a/src/libicalss/CMakeLists.txt +++ b/src/libicalss/CMakeLists.txt @@ -106,10 +106,12 @@ else() set_target_properties(icalss-static PROPERTIES OUTPUT_NAME "icalss") endif() endif() -set_target_properties(icalss PROPERTIES - VERSION ${LIBICAL_LIB_VERSION_STRING} - SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} -) +if(NOT ANDROID) + set_target_properties(icalss PROPERTIES + VERSION ${LIBICAL_LIB_VERSION_STRING} + SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} + ) +endif() set_target_properties(icalss PROPERTIES CLEAN_DIRECT_OUTPUT 1) if(NOT SHARED_ONLY AND NOT STATIC_ONLY) set_target_properties(icalss-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) @@ -164,10 +166,12 @@ if(WITH_CXX_BINDINGS) set_target_properties(icalss_cxx-static PROPERTIES OUTPUT_NAME "icalss_cxx") endif() endif() - set_target_properties(icalss_cxx PROPERTIES - VERSION ${LIBICAL_LIB_VERSION_STRING} - SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} - ) + if(NOT ANDROID) + set_target_properties(icalss_cxx PROPERTIES + VERSION ${LIBICAL_LIB_VERSION_STRING} + SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} + ) + endif() set_target_properties(icalss_cxx PROPERTIES CLEAN_DIRECT_OUTPUT 1) if(NOT SHARED_ONLY AND NOT STATIC_ONLY) set_target_properties(icalss_cxx-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) diff --git a/src/libicalvcal/CMakeLists.txt b/src/libicalvcal/CMakeLists.txt index d9caeaf6..92e9080a 100644 --- a/src/libicalvcal/CMakeLists.txt +++ b/src/libicalvcal/CMakeLists.txt @@ -49,10 +49,12 @@ else() set_target_properties(icalvcal-static PROPERTIES OUTPUT_NAME "icalvcal") endif() endif() -set_target_properties(icalvcal PROPERTIES - VERSION ${LIBICAL_LIB_VERSION_STRING} - SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} -) +if(NOT ANDROID) + set_target_properties(icalvcal PROPERTIES + VERSION ${LIBICAL_LIB_VERSION_STRING} + SOVERSION ${LIBICAL_LIB_MAJOR_VERSION} + ) +endif() set_target_properties(icalvcal PROPERTIES CLEAN_DIRECT_OUTPUT 1) if(NOT SHARED_ONLY AND NOT STATIC_ONLY) set_target_properties(icalvcal-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) |