mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 16:20:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'now-you-see-me' into 'master'

Browse Source 
Tell CMake where to find ICU properly

See merge request OpenMW/openmw!1821
This commit is contained in:
psi29a 2022-05-08 08:34:17 +00:00
commit e10bd29b8a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CI/before_script.msvc.sh
View File

@ -1066,10 +1066,12 @@ printf "ICU ${ICU_VER/_/.}... "
rm -rf ICU-${ICU_VER} rm -rf ICU-${ICU_VER}
eval 7z x -y icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip -o$(real_pwd)/ICU-${ICU_VER} $STRIP eval 7z x -y icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip -o$(real_pwd)/ICU-${ICU_VER} $STRIP
fi fi
export ICU_ROOT="$(real_pwd)/ICU-${ICU_VER}" ICU_ROOT="$(real_pwd)/ICU-${ICU_VER}"
add_cmake_opts -DICU_INCLUDE_DIR="${ICU_ROOT}/include" \ add_cmake_opts -DICU_ROOT="${ICU_ROOT}" \
-DICU_LIBRARY="${ICU_ROOT}/lib${BITS}/icuuc.lib " \ -DICU_INCLUDE_DIR="${ICU_ROOT}/include" \
-DICU_DEBUG=ON -DICU_I18N_LIBRARY="${ICU_ROOT}/lib${BITS}/icuin.lib " \
-DICU_UC_LIBRARY="${ICU_ROOT}/lib${BITS}/icuuc.lib " \
-DICU_DEBUG=ON
for config in ${CONFIGURATIONS[@]}; do for config in ${CONFIGURATIONS[@]}; do
add_runtime_dlls $config "$(pwd)/ICU-${ICU_VER}/bin${BITS}/icudt${ICU_VER/_*/}.dll" add_runtime_dlls $config "$(pwd)/ICU-${ICU_VER}/bin${BITS}/icudt${ICU_VER/_*/}.dll"