From ca54053588b167d0feb7623e2c1c49ffae0bc64d Mon Sep 17 00:00:00 2001 From: Roy Shilkrot Date: Fri, 30 Aug 2024 11:54:05 -0400 Subject: [PATCH] refactor: Update ICU library configuration and dependencies --- cmake/BuildICU.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/BuildICU.cmake b/cmake/BuildICU.cmake index 567d8f2..77a5173 100644 --- a/cmake/BuildICU.cmake +++ b/cmake/BuildICU.cmake @@ -82,19 +82,19 @@ else() if(APPLE) set(ICU_PLATFORM "MacOSX") set(TARGET_ARCH -arch\ $ENV{MACOS_ARCH}) - set(ICU_ADDITIONAL_CONFIGURE_COMMAND_PREFIX CFLAGS=${TARGET_ARCH} CXXFLAGS=${TARGET_ARCH} LDFLAGS=${TARGET_ARCH}) + set(ICU_BUILD_ENV_VARS CFLAGS=${TARGET_ARCH} CXXFLAGS=${TARGET_ARCH} LDFLAGS=${TARGET_ARCH}) else() set(ICU_PLATFORM "Linux") - set(ICU_ADDITIONAL_CONFIGURE_COMMAND_PREFIX "A=A") + set(ICU_BUILD_ENV_VARS "A=A") endif() ExternalProject_Add( ICU_build + DOWNLOAD_EXTRACT_TIMESTAMP true GIT_REPOSITORY "https://github.com/unicode-org/icu.git" GIT_TAG "release-${ICU_VERSION_DASH}" - CONFIGURE_COMMAND - ${CMAKE_COMMAND} -E env ${ICU_ADDITIONAL_CONFIGURE_COMMAND_PREFIX} /icu4c/source/runConfigureICU - ${ICU_PLATFORM} --prefix= --enable-static --disable-shared + CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${ICU_BUILD_ENV_VARS} /icu4c/source/runConfigureICU + ${ICU_PLATFORM} --prefix= --enable-static --disable-shared BUILD_COMMAND make -j4 BUILD_BYPRODUCTS /lib/${CMAKE_STATIC_LIBRARY_PREFIX}icudata${CMAKE_STATIC_LIBRARY_SUFFIX}