mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'macos-icu-fix' into 'master'

Browse Source 
macOS CI changes

Closes #6776

See merge request OpenMW/openmw!1940
This commit is contained in:
psi29a 2022-05-29 19:32:53 +00:00
commit 80ad667daa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -310,7 +310,7 @@ Ubuntu_Clang_tests_Debug:
stage: build
only:
variables:
- $CI_PROJECT_ID == "7107382" && $CI_PIPELINE_SOURCE == "push"
- $CI_PROJECT_ID == "7107382"
cache:
paths:
- ccache/

2
CMakeLists.txt
View File

@ -251,7 +251,7 @@ set(USED_OSG_PLUGINS
option(OPENMW_USE_SYSTEM_ICU "Use system ICU library instead of internal. If disabled, requires autotools" ON)
if(OPENMW_USE_SYSTEM_ICU)
find_package(ICU REQUIRED COMPONENTS uc i18n)
find_package(ICU REQUIRED COMPONENTS uc i18n data)
endif()
option(OPENMW_USE_SYSTEM_YAML_CPP "Use system yaml-cpp library instead of internal." ON)