[cmake] FindICU finds static libraries as well.

As suggested in #32736, it would be ideal to use the FindICU generated
variables to refer to the ICU library paths. However, as it stands, this
only finds the dynamic libraries, so here we find the static libraries
as well.

Author: 3405691582

cmake/modules/FindICU.cmake

@@ -22,6 +22,8 @@ foreach(MODULE ${ICU_FIND_COMPONENTS})
     HINTS ${PC_ICU_${MODULE}_INCLUDE_DIRS})
   find_library(ICU_${MODULE}_LIBRARIES NAMES icu${module} ${ICU_${MODULE}_LIB_NAME}
     HINTS ${PC_ICU_${MODULE}_LIBRARY_DIRS})
+  find_library(ICU_${MODULE}_LIBRARIES_STATIC NAMES libicu${module}.a ${ICU_${MODULE}_LIB_NAME}
+    HINTS ${PC_ICU_${MODULE}_LIBRARY_DIRS})
 endforeach()
 
 foreach(sdk ANDROID;FREEBSD;OPENBSD;LINUX;WINDOWS;HAIKU)
@@ -33,6 +35,9 @@ foreach(sdk ANDROID;FREEBSD;OPENBSD;LINUX;WINDOWS;HAIKU)
     if("${SWIFT_${sdk}_${SWIFT_HOST_VARIANT_ARCH}_ICU_${MODULE}}" STREQUAL "")
       set(SWIFT_${sdk}_${SWIFT_HOST_VARIANT_ARCH}_ICU_${MODULE} ${ICU_${MODULE}_LIBRARIES} CACHE STRING "" FORCE)
     endif()
+    if("${SWIFT_${sdk}_${SWIFT_HOST_VARIANT_ARCH}_ICU_${MODULE}_STATIC}" STREQUAL "")
+      set(SWIFT_${sdk}_${SWIFT_HOST_VARIANT_ARCH}_ICU_${MODULE}_STATIC ${ICU_${MODULE}_LIBRARIES_STATIC} CACHE STRING "" FORCE)
+    endif()
   endforeach()
 endforeach()
 

cmake/modules/SwiftConfigureSDK.cmake

@@ -76,8 +76,10 @@ function(_report_sdk prefix)
       foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
         message(STATUS "  ${arch} ICU i18n INCLUDE: ${SWIFT_${prefix}_${arch}_ICU_I18N_INCLUDE}")
         message(STATUS "  ${arch} ICU i18n LIB: ${SWIFT_${prefix}_${arch}_ICU_I18N}")
+        message(STATUS "  ${arch} ICU i18n static LIB: ${SWIFT_${prefix}_${arch}_ICU_I18N_STATIC}")
         message(STATUS "  ${arch} ICU unicode INCLUDE: ${SWIFT_${prefix}_${arch}_ICU_UC_INCLUDE}")
         message(STATUS "  ${arch} ICU unicode LIB: ${SWIFT_${prefix}_${arch}_ICU_UC}")
+        message(STATUS "  ${arch} ICU unicode static LIB: ${SWIFT_${prefix}_${arch}_ICU_UC_STATIC}")
       endforeach()
     endif()
   endif()