updated build system
Some checks failed
Public/monitarr/pipeline/head Something is wrong with the build of this commit
Some checks failed
Public/monitarr/pipeline/head Something is wrong with the build of this commit
This commit is contained in:
@@ -128,8 +128,7 @@ if(PROJECT_BUILD)
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(ICU REQUIRED COMPONENTS uc i18n io)
|
find_package(ICU REQUIRED COMPONENTS data i18n io uc)
|
||||||
link_libraries(ICU::uc ICU::i18n ICU::io)
|
|
||||||
else()
|
else()
|
||||||
message(STATUS "-=[CMake Settings]=-")
|
message(STATUS "-=[CMake Settings]=-")
|
||||||
message(STATUS " C standard: ${CMAKE_C_STANDARD}")
|
message(STATUS " C standard: ${CMAKE_C_STANDARD}")
|
||||||
|
|||||||
@@ -20,10 +20,11 @@ function(set_common_target_options name)
|
|||||||
target_compile_definitions(${name} PRIVATE U_STATIC_IMPLEMENTATION)
|
target_compile_definitions(${name} PRIVATE U_STATIC_IMPLEMENTATION)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_directories(${name} PRIVATE
|
target_link_libraries(${name} PRIVATE
|
||||||
ICU::uc
|
|
||||||
ICU::i18n
|
|
||||||
ICU::io
|
ICU::io
|
||||||
|
ICU::i18n
|
||||||
|
ICU::uc
|
||||||
|
ICU::data
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(${name} AFTER PUBLIC
|
target_include_directories(${name} AFTER PUBLIC
|
||||||
|
|||||||
@@ -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)
|
if(PROJECT_BUILD_SHARED_LIBS)
|
||||||
set(ICU_ENABLE_SHARED yes)
|
set(ICU_ENABLE_SHARED yes)
|
||||||
else()
|
else()
|
||||||
|
|||||||
@@ -32,9 +32,6 @@ RUN apk add \
|
|||||||
gflags-dev \
|
gflags-dev \
|
||||||
git \
|
git \
|
||||||
git-lfs \
|
git-lfs \
|
||||||
icu-dev \
|
|
||||||
icu-libs \
|
|
||||||
icu-static \
|
|
||||||
libogg-dev \
|
libogg-dev \
|
||||||
libogg-static \
|
libogg-static \
|
||||||
libtool \
|
libtool \
|
||||||
|
|||||||
@@ -32,9 +32,6 @@ RUN apk add \
|
|||||||
gflags-dev \
|
gflags-dev \
|
||||||
git \
|
git \
|
||||||
git-lfs \
|
git-lfs \
|
||||||
icu-dev \
|
|
||||||
icu-libs \
|
|
||||||
icu-static \
|
|
||||||
libogg-dev \
|
libogg-dev \
|
||||||
libogg-static \
|
libogg-static \
|
||||||
libtool \
|
libtool \
|
||||||
|
|||||||
@@ -47,10 +47,6 @@ if [ -f "${PROJECT_SOURCE_DIR}/LICENSE.md" ]; then
|
|||||||
rsync -av --progress "${PROJECT_SOURCE_DIR}/LICENSE.md" "${PROJECT_DIST_DIR}/"
|
rsync -av --progress "${PROJECT_SOURCE_DIR}/LICENSE.md" "${PROJECT_DIST_DIR}/"
|
||||||
fi
|
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
|
if [ "${PROJECT_BUILD_SHARED_LIBS}" == "ON" ] && [ "${PROJECT_IS_MINGW}" != "1" ]; then
|
||||||
rsync -av --progress ${PROJECT_EXTERNAL_BUILD_ROOT}/ "${PROJECT_DIST_DIR}/"
|
rsync -av --progress ${PROJECT_EXTERNAL_BUILD_ROOT}/ "${PROJECT_DIST_DIR}/"
|
||||||
pushd "${PROJECT_DIST_DIR}"
|
pushd "${PROJECT_DIST_DIR}"
|
||||||
|
|||||||
0
support/3rd_party/icu_configure.sh
vendored
Normal file → Executable file
0
support/3rd_party/icu_configure.sh
vendored
Normal file → Executable file
Reference in New Issue
Block a user