Merge pull request swiftlang#18915 from smeenai/findicu

Author: swift-ci

cmake/modules/FindICU.cmake

@@ -9,26 +9,19 @@ foreach(MODULE ${ICU_FIND_COMPONENTS})
   string(TOUPPER "${MODULE}" MODULE)
   string(TOLOWER "${MODULE}" module)
   list(APPEND ICU_REQUIRED
-    ICU_${MODULE}_INCLUDE_DIR ICU_${MODULE}_LIBRARIES)
+    ICU_${MODULE}_INCLUDE_DIRS ICU_${MODULE}_LIBRARIES)
 
   pkg_check_modules(PC_ICU_${MODULE} QUIET icu-${module})
-  if(NOT ${PKGCONFIG_FOUND})
+  if(NOT PKG_CONFIG_FOUND)
     # PkgConfig doesn't exist on this system, so we manually provide hints via CMake.
     set(PC_ICU_${MODULE}_INCLUDE_DIRS "${ICU_${MODULE}_INCLUDE_DIRS}")
     set(PC_ICU_${MODULE}_LIBRARY_DIRS "${ICU_${MODULE}_LIBRARY_DIRS}")
   endif()
 
-  if((${PC_ICU_${MODULE}_FOUND}) OR (NOT ${PKGCONFIG_FOUND}))
-    set(ICU_${MODULE}_DEFINITIONS ${PC_ICU_${MODULE}_CFLAGS_OTHER})
-
-    find_path(ICU_${MODULE}_INCLUDE_DIR unicode
-      HINTS ${PC_ICU_${MODULE}_INCLUDEDIR} ${PC_ICU_${MODULE}_INCLUDE_DIRS})
-    set(ICU_${MODULE}_INCLUDE_DIRS ${ICU_${MODULE}_INCLUDE_DIR})
-
-    find_library(ICU_${MODULE}_LIBRARY NAMES icu${module} ${ICU_${MODULE}_LIB_NAME}
-      HINTS ${PC_ICU_${MODULE}_LIBDIR} ${PC_ICU_${MODULE}_LIBRARY_DIRS})
-    set(ICU_${MODULE}_LIBRARIES ${ICU_${MODULE}_LIBRARY})
-  endif()
+  find_path(ICU_${MODULE}_INCLUDE_DIRS unicode
+    HINTS ${PC_ICU_${MODULE}_INCLUDE_DIRS})
+  find_library(ICU_${MODULE}_LIBRARIES NAMES icu${module} ${ICU_${MODULE}_LIB_NAME}
+    HINTS ${PC_ICU_${MODULE}_LIBRARY_DIRS})
 endforeach()
 
 foreach(sdk ANDROID;FREEBSD;LINUX;WINDOWS;HAIKU)
@@ -38,7 +31,7 @@ foreach(sdk ANDROID;FREEBSD;LINUX;WINDOWS;HAIKU)
       set(SWIFT_${sdk}_${SWIFT_HOST_VARIANT_ARCH}_ICU_${MODULE}_INCLUDE ${ICU_${MODULE}_INCLUDE_DIRS} CACHE STRING "" FORCE)
     endif()
     if("${SWIFT_${sdk}_${SWIFT_HOST_VARIANT_ARCH}_ICU_${MODULE}}" STREQUAL "")
-      set(SWIFT_${sdk}_${SWIFT_HOST_VARIANT_ARCH}_ICU_${MODULE} ${ICU_${MODULE}_LIBRARY} CACHE STRING "" FORCE)
+      set(SWIFT_${sdk}_${SWIFT_HOST_VARIANT_ARCH}_ICU_${MODULE} ${ICU_${MODULE}_LIBRARIES} CACHE STRING "" FORCE)
     endif()
   endforeach()
 endforeach()

lib/Driver/CMakeLists.txt

@@ -33,8 +33,8 @@ if(SWIFT_BUILD_STATIC_STDLIB)
       else()
         set(ICU_STATICLIB "FALSE")
         find_package(ICU REQUIRED COMPONENTS uc i18n)
-        get_filename_component(ICU_UC_LIBDIR "${ICU_UC_LIBRARY}" DIRECTORY)
-        get_filename_component(ICU_I18N_LIBDIR "${ICU_I18N_LIBRARY}" DIRECTORY)
+        get_filename_component(ICU_UC_LIBDIR "${ICU_UC_LIBRARIES}" DIRECTORY)
+        get_filename_component(ICU_I18N_LIBDIR "${ICU_I18N_LIBRARIES}" DIRECTORY)
       endif()
       set(linkfile "${lowercase_sdk}/static-stdlib-args.lnk")
       add_custom_command_target(swift_static_stdlib_${sdk}_args