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

Merge branch 'collada_dom' into 'master'

Browse Source 
Set collada_dom version before finding the package

See merge request OpenMW/openmw!2517
This commit is contained in:
psi29a 2022-11-22 16:16:14 +00:00
commit e78886e4cc
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CI/install_debian_deps.sh
View File

@ -25,7 +25,7 @@ declare -rA GROUPED_DEPS=(
" "
# These dependencies can alternatively be built and linked statically. # These dependencies can alternatively be built and linked statically.
[openmw-deps-dynamic]="libmygui-dev libopenscenegraph-dev libsqlite3-dev" [openmw-deps-dynamic]="libmygui-dev libopenscenegraph-dev libsqlite3-dev libcollada-dom-dev"
[clang-tidy]="clang-tidy" [clang-tidy]="clang-tidy"
# Pre-requisites for building MyGUI and OSG for static linking. # Pre-requisites for building MyGUI and OSG for static linking.

10
CMakeLists.txt
View File

@ -265,7 +265,15 @@ set(USED_OSG_PLUGINS
osgdb_serializers_osg osgdb_serializers_osg
osgdb_tga) osgdb_tga)
find_package(collada_dom) if(NOT COLLADA_DOM_VERSION_MAJOR)
set(COLLADA_DOM_VERSION_MAJOR 2)
endif()
if(NOT COLLADA_DOM_VERSION_MINOR)
set(COLLADA_DOM_VERSION_MINOR 5)
endif()
find_package(collada_dom 2.5)
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)