Revision 4d903f9c1c7b5fbd3864959120f457b83e2d743d authored by Slava Pestov on 16 January 2016, 02:37:57 UTC, committed by Slava Pestov on 19 January 2016, 22:22:14 UTC
In master, this was fixed by Luke Howard as part of some other changes in the following patch: <https://github.com/apple/swift/commit/b5880f386b814f8b5cb220d1c4e65e74c04eccf4> This patch back-ports the relevant part of the above (checking for a true return value from hasMetadataPattern() vs checking for a BoundGenericType). Fixes <rdar://problem/24183374>.
1 parent b971595
FindICU.cmake
# Find libicu's libraries
include(FindPackageHandleStandardArgs)
find_package(PkgConfig)
set(ICU_REQUIRED)
foreach(MODULE ${ICU_FIND_COMPONENTS})
string(TOUPPER "${MODULE}" MODULE)
string(TOLOWER "${MODULE}" module)
list(APPEND ICU_REQUIRED
ICU_${MODULE}_INCLUDE_DIR ICU_${MODULE}_LIBRARIES)
pkg_check_modules(PC_ICU_${MODULE} QUIET icu-${module})
if(${PC_ICU_${MODULE}_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_DIR ${ICU_${MODULE}_INCLUDE_DIR})
find_library(ICU_${MODULE}_LIBRARY NAMES icu${module}
HINTS ${PC_ICU_${MODULE}_LIBDIR} ${PC_ICU_${MODULE}_LIBRARY_DIRS})
set(ICU_${MODULE}_LIBRARIES ${ICU_${MODULE}_LIBRARY})
endif()
endforeach()
find_package_handle_standard_args(ICU DEFAULT_MSG ${ICU_REQUIRED})
mark_as_advanced(${ICU_REQUIRED})
Computing file changes ...