From fdb731a6d067be0af0094a8bc47398c57d4c4068 Mon Sep 17 00:00:00 2001 From: elsid Date: Sun, 20 Nov 2022 14:22:03 +0100 Subject: [PATCH] Set collada_dom version before finding the package 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. --- CI/install_debian_deps.sh | 2 +- CMakeLists.txt | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh index bc35e8c040..bad780315b 100755 --- a/CI/install_debian_deps.sh +++ b/CI/install_debian_deps.sh @@ -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. diff --git a/CMakeLists.txt b/CMakeLists.txt index a5ba7e8fbc..358f3254cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)