diff --git a/CMakeLists.txt b/CMakeLists.txt index b14bfec..967bae5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,8 +128,7 @@ if(PROJECT_BUILD) ) endif() - find_package(ICU REQUIRED COMPONENTS uc i18n io) - link_libraries(ICU::uc ICU::i18n ICU::io) + find_package(ICU REQUIRED COMPONENTS data i18n io uc) else() message(STATUS "-=[CMake Settings]=-") message(STATUS " C standard: ${CMAKE_C_STANDARD}") diff --git a/cmake/functions.cmake b/cmake/functions.cmake index e365a61..fd1d2ec 100644 --- a/cmake/functions.cmake +++ b/cmake/functions.cmake @@ -20,10 +20,11 @@ function(set_common_target_options name) target_compile_definitions(${name} PRIVATE U_STATIC_IMPLEMENTATION) endif() - target_link_directories(${name} PRIVATE - ICU::uc - ICU::i18n + target_link_libraries(${name} PRIVATE ICU::io + ICU::i18n + ICU::uc + ICU::data ) target_include_directories(${name} AFTER PUBLIC diff --git a/cmake/libraries/icu.cmake b/cmake/libraries/icu.cmake index f278b9d..3e1fe08 100644 --- a/cmake/libraries/icu.cmake +++ b/cmake/libraries/icu.cmake @@ -1,4 +1,4 @@ -if(PROJECT_IS_DARWIN AND NOT PROJECT_BUILD) +if((PROJECT_IS_DARWIN OR PROJECT_REQUIRE_ALPINE) AND NOT PROJECT_BUILD) if(PROJECT_BUILD_SHARED_LIBS) set(ICU_ENABLE_SHARED yes) else() diff --git a/docker/aarch64/alpine b/docker/aarch64/alpine index 7f2d03c..192e70b 100644 --- a/docker/aarch64/alpine +++ b/docker/aarch64/alpine @@ -32,9 +32,6 @@ RUN apk add \ gflags-dev \ git \ git-lfs \ - icu-dev \ - icu-libs \ - icu-static \ libogg-dev \ libogg-static \ libtool \ diff --git a/docker/x86_64/alpine b/docker/x86_64/alpine index 94e399d..8974cfc 100644 --- a/docker/x86_64/alpine +++ b/docker/x86_64/alpine @@ -32,9 +32,6 @@ RUN apk add \ gflags-dev \ git \ git-lfs \ - icu-dev \ - icu-libs \ - icu-static \ libogg-dev \ libogg-static \ libtool \ diff --git a/scripts/make_common.sh b/scripts/make_common.sh index f4ae5b9..8dfd20f 100755 --- a/scripts/make_common.sh +++ b/scripts/make_common.sh @@ -47,10 +47,6 @@ if [ -f "${PROJECT_SOURCE_DIR}/LICENSE.md" ]; then rsync -av --progress "${PROJECT_SOURCE_DIR}/LICENSE.md" "${PROJECT_DIST_DIR}/" fi -if [ "${PROJECT_IS_MINGW}" != "1" ] && [ "${PROJECT_REQUIRE_ALPINE}" == "ON" ]; then - rsync -av --progress /usr/share/icu/74.2/ "${PROJECT_DIST_DIR}/icu/" -fi - if [ "${PROJECT_BUILD_SHARED_LIBS}" == "ON" ] && [ "${PROJECT_IS_MINGW}" != "1" ]; then rsync -av --progress ${PROJECT_EXTERNAL_BUILD_ROOT}/ "${PROJECT_DIST_DIR}/" pushd "${PROJECT_DIST_DIR}" diff --git a/support/3rd_party/icu_configure.sh b/support/3rd_party/icu_configure.sh old mode 100644 new mode 100755