mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2024-12-28 00:15:06 +00:00
Code Issues Projects Releases Wiki Activity

Set collada_dom version before finding the package

Browse Source 
The package cmake config uses wrong variables for minor and major versions. They
should be collada_dom_VERSION_MINOR and collada_dom_VERSION_MAJOR but they are
COLLADA_DOM_VERSION_MINOR and COLLADA_DOM_VERSION_MAJOR. CMake variables are
case sensitive so used variables are just empty strings. Set them manually as a
workaround.
This commit is contained in:
elsid 2022-11-20 14:22:03 +01:00
parent 4fb318ce57
commit fdb731a6d0
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
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.
[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.

10
CMakeLists.txt
View File

@ -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)