Skip to content

Commit

Permalink
avoid finding ICU
Browse files Browse the repository at this point in the history
  • Loading branch information
annulen committed Sep 26, 2023
1 parent d07d2e9 commit c51d344
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions Source/cmake/OptionsQt.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,12 @@ if (MACOS_USE_SYSTEM_ICU)
add_definitions(-DU_DISABLE_RENAMING=1)
endif ()
# FIXME
if (CONAN_ICU_ROOT)
message("CONAN_ICU_ROOT=${CONAN_ICU_ROOT}")
find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc PATHS ${CONAN_ICU_ROOT} NO_DEFAULT_PATH)
if (TARGET CONAN_PKG::icu)
set(USE_APPLE_ICU OFF)
add_library(ICU::data ALIAS CONAN_PKG::icu)
add_library(ICU::i18n ALIAS CONAN_PKG::icu)
add_library(ICU::uc ALIAS CONAN_PKG::icu)
#find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc PATHS ${CONAN_ICU_ROOT} NO_DEFAULT_PATH)
else ()
find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc)
endif ()
Expand Down

0 comments on commit c51d344

Please sign in to comment.