mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-16 16:20:53 +00:00
Merge branch 'collada_dom' into 'master'
Set collada_dom version before finding the package See merge request OpenMW/openmw!2517
This commit is contained in:
commit
e78886e4cc
@ -25,7 +25,7 @@ declare -rA GROUPED_DEPS=(
|
||||
"
|
||||
|
||||
# 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"
|
||||
|
||||
# Pre-requisites for building MyGUI and OSG for static linking.
|
||||
|
@ -265,7 +265,15 @@ set(USED_OSG_PLUGINS
|
||||
osgdb_serializers_osg
|
||||
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)
|
||||
if(OPENMW_USE_SYSTEM_ICU)
|
||||
|
Loading…
x
Reference in New Issue
Block a user