mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-07 01:15:36 +00:00
Code Issues Releases Wiki Activity

Merge branch 'icu-build-updates' into 'master'

Browse source 
ICU Build updates

Closes #6708

See merge request OpenMW/openmw!1789
This commit is contained in:
psi29a 2022-04-21 09:46:46 +00:00
commit 43f1d27c17
2 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
extern/CMakeLists.txt vendored
View file

@ -244,25 +244,33 @@ if (NOT OPENMW_USE_SYSTEM_YAML_CPP)
endif() endif()
if (NOT OPENMW_USE_SYSTEM_ICU) if (NOT OPENMW_USE_SYSTEM_ICU)
set(ICU_ENV "ICU_DATA_FILTER_FILE=${CMAKE_CURRENT_SOURCE_DIR}/icufilters.json")
if (ANDROID) if (ANDROID)
# Note: Must be a build directory, not an install root, since the configure script # Note: Must be a build directory, not an install root, since the configure script
# looks for a configuration file which does not get installed. # looks for a configuration file which does not get installed.
set(OPENMW_ICU_HOST_BUILD_DIR "" CACHE STRING "A pre-built ICU build directory for the host system if cross-compiling") set(OPENMW_ICU_HOST_BUILD_DIR "" CACHE STRING "A pre-built ICU build directory for the host system if cross-compiling")
if (OPENMW_ICU_HOST_BUILD_DIR STREQUAL "")
message(FATAL_ERROR "If cross-compiling on android you must set the \
OPENMW_ICU_HOST_BUILD_DIR to the path of a pre-compiled build of \
ICU 70.1 for the system doing the build, as ICU needs to be able \
to run its own executables as part of the build process.")
endif()
# We need a host version of ICU so that the tools can be run when building the data library. # We need a host version of ICU so that the tools can be run when building the data library.
set(NDK_STANDARD_ROOT ${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64) set(NDK_STANDARD_ROOT ${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64)
string(REPLACE "android-" "" ANDROIDVER ${ANDROID_PLATFORM}) string(REPLACE "android-" "" ANDROIDVER ${ANDROID_PLATFORM})
set(ICU_ENV
"CC=ccache ${NDK_STANDARD_ROOT}/bin/aarch64-linux-android${ANDROIDVER}-clang"
"CXX=ccache ${NDK_STANDARD_ROOT}/bin/aarch64-linux-android${ANDROIDVER}-clang"
"RANLIB=${NDK_STANDARD_ROOT}/bin/aarch64-linux-android-ranlib"
"AR=${NDK_STANDARD_ROOT}/bin/aarch64-linux-android-ar"
"CPPFLAGS=${ANDROID_COMPILER_FLAGS}"
"LDFLAGS=${ANDROID_LINKER_FLAGS} -lc -lstdc++"
)
# Wants a triple such as aarch64-linux-android, excluding a trailing # Wants a triple such as aarch64-linux-android, excluding a trailing
# -clang etc. # -clang etc.
string(REGEX MATCH "^[^-]\+-[^-]+-[^-]+" ICU_TOOLCHAIN_NAME ${ANDROID_TOOLCHAIN_NAME}) string(REGEX MATCH "^[^-]\+-[^-]+-[^-]+" ICU_TOOLCHAIN_NAME ${ANDROID_TOOLCHAIN_NAME})
set(ICU_ADDITIONAL_OPTS --host=${ICU_TOOLCHAIN_NAME}${ANDROIDVER} --with-cross-build=${OPENMW_ICU_HOST_BUILD_DIR}) set(ICU_ENV
${ICU_ENV}
"CC=${CMAKE_C_COMPILER_LAUNCHER} ${NDK_STANDARD_ROOT}/bin/${ICU_TOOLCHAIN_NAME}${ANDROIDVER}-clang"
"CXX=${CMAKE_CXX_COMPILER_LAUNCHER} ${NDK_STANDARD_ROOT}/bin/${ICU_TOOLCHAIN_NAME}${ANDROIDVER}-clang"
"RANLIB=${NDK_STANDARD_ROOT}/bin/${ICU_TOOLCHAIN_NAME}-ranlib"
"AR=${NDK_STANDARD_ROOT}/bin/${ICU_TOOLCHAIN_NAME}-ar"
"CPPFLAGS=${ANDROID_COMPILER_FLAGS}"
"LDFLAGS=${ANDROID_LINKER_FLAGS} -lc -lstdc++"
)
set(ICU_ADDITIONAL_OPTS --disable-tools --host=${ICU_TOOLCHAIN_NAME}${ANDROIDVER} --with-cross-build=${OPENMW_ICU_HOST_BUILD_DIR})
endif() endif()
include(ExternalProject) include(ExternalProject)
ExternalProject_Add(icu ExternalProject_Add(icu
@ -271,7 +279,7 @@ if (NOT OPENMW_USE_SYSTEM_ICU)
SOURCE_DIR fetched/icu SOURCE_DIR fetched/icu
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${ICU_ENV} CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${ICU_ENV}
<SOURCE_DIR>/icu4c/source/configure --enable-static --disable-shared <SOURCE_DIR>/icu4c/source/configure --enable-static --disable-shared
--disable-tests --disable-samples --disable-icuio --disable-extras --disable-tools ${ICU_ADDITIONAL_OPTS} --disable-tests --disable-samples --disable-icuio --disable-extras ${ICU_ADDITIONAL_OPTS}
BUILD_COMMAND make BUILD_COMMAND make
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )

19
extern/icufilters.json vendored Normal file
View file

@ -0,0 +1,19 @@
{
"featureFilters": {
"brkitr_rules": "exclude",
"brkitr_dictionaries": "exclude",
"brkitr_tree": "exclude",
"coll_ucadata": "exclude",
"coll_tree": "exclude",
"confusables": "exclude",
"conversion_mappings": "exclude",
"zone_tree": "exclude",
"zone_supplemental": "exclude",
"translit": "exclude",
"cnvalias": "exclude",
"lang_tree": "exclude",
"normalization": "exclude",
"region_tree": "exclude",
"stringprep": "exclude"
}
}