From 784566409ce01f0a47646363e0817dbf2f293dc1 Mon Sep 17 00:00:00 2001 From: Miguel Horta Date: Sat, 6 Apr 2024 14:02:23 +0100 Subject: [PATCH] fix: change FindICU to properly check pkg-config results While skiping this checks for Android. Idealy it would also be done in Android, something to improve a in future release. --- cmake/FindICU.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake index 15c0edc047..53867c3337 100644 --- a/cmake/FindICU.cmake +++ b/cmake/FindICU.cmake @@ -42,13 +42,14 @@ foreach(MOD_NAME IN LISTS ICU_FIND_COMPONENTS) # Check the libraries returned by pkg-config really exist. unset(PC_LIBRARIES) foreach(LIBRARY IN LISTS PC_ICU_${MOD_NAME}_LIBRARIES) + unset(PC_LIBRARY CACHE) if(NOT PC_ICU_${MOD_NAME}_LIBRARY) - find_library(PC_ICU_${MOD_NAME}_LIBRARY NAMES ${LIBRARY}) + find_library(PC_LIBRARY NAMES ${LIBRARY}) endif() if(NOT PC_ICU_${MOD_NAME}_LIBRARY) unset(PC_ICU_${MOD_NAME}_FOUND) endif() - list(APPEND PC_LIBRARIES ${PC_ICU_${MOD_NAME}_LIBRARY}) + list(APPEND PC_LIBRARIES ${PC_LIBRARY}) endforeach() unset(PC_LIBRARY CACHE)