diff --git a/CMakeLists.txt b/CMakeLists.txt index e38e6b48..edd817b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,7 +118,7 @@ if(LIBXML2_WITH_ICONV) endif() if(LIBXML2_WITH_ICU) - find_package(ICU REQUIRED COMPONENTS data i18n uc) + find_package(ICU REQUIRED COMPONENTS uc) endif() if(LIBXML2_WITH_LZMA) @@ -336,16 +336,12 @@ if(LIBXML2_WITH_ICONV) endif() if(LIBXML2_WITH_ICU) - target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc) - if(WIN32) - set(ICU_LDFLAGS "-licudt -licuin -licuuc") - else() - set(ICU_LDFLAGS "-licudata -licui18n -licuuc") - endif() + target_link_libraries(LibXml2 PRIVATE ICU::uc) + set(ICU_LDFLAGS "-licuuc") list(APPEND XML_PRIVATE_LIBS "${ICU_LDFLAGS}") - pkg_check_modules(ICU_PC IMPORTED_TARGET icu-i18n) + pkg_check_modules(ICU_PC IMPORTED_TARGET icu-uc) if(ICU_PC_FOUND) - list(APPEND XML_PC_REQUIRES icu-i18n) + list(APPEND XML_PC_REQUIRES icu-uc) else() list(APPEND XML_PC_LIBS "${ICU_LDFLAGS}") endif() diff --git a/configure.ac b/configure.ac index c6dc93d5..e7bad24d 100644 --- a/configure.ac +++ b/configure.ac @@ -984,10 +984,10 @@ if test "$with_icu" != "no" && test "$with_icu" != "" ; then # Try pkg-config first so that static linking works. # If this succeeeds, we ignore the WITH_ICU directory. - PKG_CHECK_MODULES([ICU], [icu-i18n], [ - WITH_ICU=1; XML_PC_REQUIRES="${XML_PC_REQUIRES} icu-i18n" + PKG_CHECK_MODULES([ICU], [icu-uc], [ + WITH_ICU=1; XML_PC_REQUIRES="${XML_PC_REQUIRES} icu-uc" m4_ifdef([PKG_CHECK_VAR], - [PKG_CHECK_VAR([ICU_DEFS], [icu-i18n], [DEFS])]) + [PKG_CHECK_VAR([ICU_DEFS], [icu-uc], [DEFS])]) if test "x$ICU_DEFS" != "x"; then ICU_CFLAGS="$ICU_CFLAGS $ICU_DEFS" fi],[:]) diff --git a/meson.build b/meson.build index 7b5880e3..f5e8f6ed 100644 --- a/meson.build +++ b/meson.build @@ -374,7 +374,7 @@ endif # icu if want_icu - icu_dep = dependency('icu-i18n', method: 'pkg-config') + icu_dep = dependency('icu-uc') defs = icu_dep.get_variable(pkgconfig: 'DEFS') if cc.has_argument(defs) libxml2_cflags += defs