updated build system
Some checks failed
Public/monitarr/pipeline/head Something is wrong with the build of this commit

This commit is contained in:
2025-10-10 12:53:46 -05:00
parent b190099228
commit 5fe4700446
7 changed files with 6 additions and 16 deletions

View File

@@ -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}")

View File

@@ -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

View File

@@ -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()

View File

@@ -32,9 +32,6 @@ RUN apk add \
gflags-dev \
git \
git-lfs \
icu-dev \
icu-libs \
icu-static \
libogg-dev \
libogg-static \
libtool \

View File

@@ -32,9 +32,6 @@ RUN apk add \
gflags-dev \
git \
git-lfs \
icu-dev \
icu-libs \
icu-static \
libogg-dev \
libogg-static \
libtool \

View File

@@ -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}"

0
support/3rd_party/icu_configure.sh vendored Normal file → Executable file
View File