From d7e4632ed4c20c1e5dd4d9d816977e0321ced5e9 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 23 Jul 2016 22:46:34 +0000 Subject: [PATCH] make the ICU CMake module check for icuuc library too Signed-off-by: Ivailo Monev --- cmake/modules/FindICU.cmake | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindICU.cmake b/cmake/modules/FindICU.cmake index be3e54914..6e21c3cdf 100644 --- a/cmake/modules/FindICU.cmake +++ b/cmake/modules/FindICU.cmake @@ -39,7 +39,21 @@ find_library(ICU_LIBRARIES ${LIB_INSTALL_DIR} ) +find_library(ICUUC_LIBRARIES + icuuc + HINTS + $ENV{ICUDIR}/lib + ${PC_ICU_LIBDIR} + /usr/lib + /usr/local/lib + ${LIB_INSTALL_DIR} +) + +if(ICU_LIBRARIES AND ICUUC_LIBRARIES) + set(ICU_LIBRARIES ${ICU_LIBRARIES} ${ICUUC_LIBRARIES}) +endif() + include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(ICU DEFAULT_MSG ICU_INCLUDES ICU_LIBRARIES) +find_package_handle_standard_args(ICU DEFAULT_MSG ICU_INCLUDES ICU_LIBRARIES ICUUC_LIBRARIES) -mark_as_advanced(ICU_INCLUDES ICU_LIBRARIES) +mark_as_advanced(ICU_INCLUDES ICU_LIBRARIES ICUUC_LIBRARIES) -- 2.11.0