OSDN Git Service

make the ICU CMake module check for icuuc library too
authorIvailo Monev <xakepa10@gmail.com>
Sat, 23 Jul 2016 22:46:34 +0000 (22:46 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Sat, 23 Jul 2016 22:46:34 +0000 (22:46 +0000)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
cmake/modules/FindICU.cmake

index be3e549..6e21c3c 100644 (file)
@@ -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)