Update libiconv no-rebuild-if-not-needed logic

Author: ViliusSutkus89

3rdparty/EPHelpers.cmake

@@ -15,9 +15,17 @@ function(FilterDependsList DEPENDS_LIST)
       if (TARGET ${DEPENDENCY})
         message(STATUS "${DEPENDENCY} found as a target")
         list(APPEND RESULT ${DEPENDENCY})
-      # Hardcoded skip for iconv, because it does not have pkg-config.pc
-      # If iconv target not found, just assume it's either built already or not needed due to ANDROID-28+
-      elseif(NOT "${DEPENDENCY}" STREQUAL "iconv")
+
+      elseif("${DEPENDENCY}" STREQUAL "iconv")
+        # iconv does not have pkg-config.pc. Just check if the it exists.
+        # ANDROID-28+ has it built in, no need.
+        if (NOT (ANDROID_NATIVE_API_LEVEL GREATER_EQUAL 28))
+          if (NOT EXISTS ${THIRDPARTY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}iconv${CMAKE_STATIC_LIBRARY_SUFFIX})
+            message(FATAL_ERROR "Missing dependency ${DEPENDENCY}!")
+          endif()
+        endif()
+
+      else()
         pkg_check_modules(LIBNAME REQUIRED ${DEPENDENCY})
       endif()
     endforeach(DEPENDENCY IN ITEMS ${INPUT})

3rdparty/packages/iconv.cmake

@@ -1,13 +1,17 @@
 include_guard(GLOBAL)
 
+# iconv not needed on ANDROID-28+
+IF (ANDROID_NATIVE_API_LEVEL GREATER_EQUAL 28)
+  return()
+endif()
+
 # libiconv doesn't provide pkg-config .pc
 # Check if build sneeded, before calling to EPAutotools
-find_package(Iconv QUIET)
-
-# Android >= 28 provides iconv
-IF ((NOT Iconv_FOUND) AND NOT (ANDROID_NATIVE_API_LEVEL GREATER_EQUAL 28))
-  ExternalProjectAutotools(iconv
-    URL https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz
-    URL_HASH SHA256=e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
-  )
+if (EXISTS ${THIRDPARTY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}iconv${CMAKE_STATIC_LIBRARY_SUFFIX})
+  return()
 endif()
+
+ExternalProjectAutotools(iconv
+  URL https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz
+  URL_HASH SHA256=e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
+)