mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-13 00:13:17 +00:00
Code Issues Releases Wiki Activity

Merge branch 'icu-fix2' into 'master'

Browse source 
Detect ICU on macOS

See merge request OpenMW/openmw!1760
This commit is contained in:
psi29a 2022-04-11 07:24:33 +00:00
commit 1ddf703106
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CI/before_install.osx.sh
View file

@ -16,7 +16,6 @@ command -v qmake >/dev/null 2>&1 || brew install qt@5
brew install icu4c brew install icu4c
brew install yaml-cpp brew install yaml-cpp
export PATH="/usr/local/opt/qt@5/bin:$PATH" # needed to use qmake in none default path as qt now points to qt6 export PATH="/usr/local/opt/qt@5/bin:$PATH" # needed to use qmake in none default path as qt now points to qt6
export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
ccache --version ccache --version
cmake --version cmake --version

1
CI/before_script.osx.sh
View file

@ -26,5 +26,6 @@ cmake \
-D BUILD_BSATOOL=TRUE \ -D BUILD_BSATOOL=TRUE \
-D BUILD_ESSIMPORTER=TRUE \ -D BUILD_ESSIMPORTER=TRUE \
-D BUILD_NIFTEST=TRUE \ -D BUILD_NIFTEST=TRUE \
-D ICU_ROOT="/usr/local/opt/icu4c"
-G"Unix Makefiles" \ -G"Unix Makefiles" \
.. ..

4
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) option(OPENMW_USE_SYSTEM_ICU "Use system ICU library instead of internal. If disabled, requires autotools" ON)
if(OPENMW_USE_SYSTEM_ICU) if(OPENMW_USE_SYSTEM_ICU)
find_package(ICU COMPONENTS uc i18n) find_package(ICU REQUIRED COMPONENTS uc i18n)
endif() endif()
option(OPENMW_USE_SYSTEM_YAML_CPP "Use system yaml-cpp library instead of internal." ON) option(OPENMW_USE_SYSTEM_YAML_CPP "Use system yaml-cpp library instead of internal." ON)
@ -262,7 +262,7 @@ else()
endif() endif()
option(YAML_CPP_STATIC "Link static build of yaml-cpp into the binaries" ${_yaml_cpp_static_default}) option(YAML_CPP_STATIC "Link static build of yaml-cpp into the binaries" ${_yaml_cpp_static_default})
if (OPENMW_USE_SYSTEM_YAML_CPP) if (OPENMW_USE_SYSTEM_YAML_CPP)
find_package(yaml-cpp) find_package(yaml-cpp REQUIRED)
endif() endif()
add_subdirectory(extern) add_subdirectory(extern)