From 147bcf2ed341683a088d3447f94736b76ba8f028 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sun, 3 Dec 2023 18:20:19 +0100 Subject: cmake: Improve finding ICU library by using CMake's FindICU module to locate the required icuuc and icui18n libraries for use with boost regex icu. --- CMakeLists.txt | 9 ++++++--- README.md | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab17cedd..e6b1270d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,6 +107,9 @@ endif() ######################################################################## +include(FindICU) +find_package(ICU 63 OPTIONAL_COMPONENTS uc i18n) + include(CheckIncludeFiles) include(CheckLibraryExists) include(CheckFunctionExists) @@ -159,8 +162,8 @@ endif() cmake_push_check_state() -set(CMAKE_REQUIRED_INCLUDES ${CMAKE_INCLUDE_PATH} ${Boost_INCLUDE_DIRS}) -set(CMAKE_REQUIRED_LIBRARIES ${Boost_LIBRARIES} icuuc ${PROFILE_LIBS}) +set(CMAKE_REQUIRED_INCLUDES ${CMAKE_INCLUDE_PATH} ${Boost_INCLUDE_DIRS} ${ICUE_INCLUDE_DIRS}) +set(CMAKE_REQUIRED_LIBRARIES ${Boost_LIBRARIES} ${ICU_LIBRARIES} ${PROFILE_LIBS}) check_cxx_source_runs(" #include @@ -298,7 +301,7 @@ macro(add_ledger_library_dependencies _target) target_link_libraries(${_target} ${Boost_LIBRARIES}) endif() if (HAVE_BOOST_REGEX_UNICODE) - target_link_libraries(${_target} icuuc) + target_link_libraries(${_target} ${ICU_LIBRARIES}) endif() target_link_libraries(${_target} ${PROFILE_LIBS}) endmacro(add_ledger_library_dependencies _target) diff --git a/README.md b/README.md index 76563266..caf3e92f 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ Dependency | Version (or greater) [Gmp] | 6.1.2 [Mpfr] | 4.0.2 [utfcpp] | 3.2.3 +[ICU] | 63 _optional_ [gettext] | 0.17 _optional_ [libedit] | 20090111-3.0 _optional_ [Python] | 3.9 _optional_ @@ -189,6 +190,7 @@ hack as much as you like, then [open a pull request on GitHub](https://github.co [GMP]: https://gmplib.org/ [MPFR]: https://www.mpfr.org/ [utfcpp]: https://utfcpp.sourceforge.net +[ICU]: https://icu.unicode.org [gettext]: https://www.gnu.org/software/gettext/ [libedit]: https://thrysoee.dk/editline/ [Python]: https://python.org -- cgit v1.2.3