Merge branch '3.0'

7 files changed, 58 insertions, 29 deletions

diff --git a/Install.txt b/Install.txt
index bb5f0af6..5333b896 100644
--- a/Install.txt
+++ b/Install.txt
@@ -89,6 +89,21 @@ Homebrew:
   catalog files can be found so the gtk entities are located, like so:
     export XML_CATALOG_FILES=/usr/local/etc/xml/catalog
 
+== Building for Android ==
+
+% mkdir build
+% cd build
+$ export ANDROID_NDK=/path/to/android-ndk
+% cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
+        -DCMAKE_INSTALL_PREFIX=/install/path .. \
+        -DANDROID_ABI=[x86,x86_64,armeabi-v7a,arm64-v8a,...]
+        #see https://developer.android.com/ndk/guides/cmake for more options
+% make
+% make install
+
+For more information about building CMake projects on Android see
+https://developer.android.com/ndk/guides/cmake
+
 == Optional Dependencies ==
 * libicu "International Components for Unicode" development libraries.
   Highly recommended for RSCALE support.
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index bf654dd1..9d6a086c 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -56,6 +56,7 @@ Version 3.1.0 (NOT RELEASED YET):
 
 Version 3.0.17 (UNRELEASED):
 ----------------------------
+ * Improved Android support
 
 Version 3.0.16 (17 October 2022):
 ---------------------------------
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)