From 3e9510a89f5416dc67d1a7b61d66b5afcbf5f18d Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Mon, 21 Jun 2021 16:13:33 +0200 Subject: [PATCH 1/2] reorg of cmake osg plugins; add osgSim and osgdb_dae requirements --- CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6928e37935..efb2758459 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -243,17 +243,20 @@ if (USE_QT) endif() set(USED_OSG_COMPONENTS + osgAnimation osgDB - osgViewer - osgText osgGA + osgFX osgParticle + osgText osgUtil - osgFX osgShadow - osgAnimation) + osgSim + osgViewer + ) set(USED_OSG_PLUGINS osgdb_bmp + osgdb_dae osgdb_dds osgdb_freetype osgdb_jpeg From 1237c45ecb55b3ebc77bca8f23b41d118767fa85 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Mon, 21 Jun 2021 17:24:19 +0200 Subject: [PATCH 2/2] turn on BUILD_OSG_PLUGIN_DAE for non system OSG --- extern/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 0d3b5a70f8..e065e5db29 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -103,13 +103,14 @@ if(NOT OPENMW_USE_SYSTEM_OSG) set(BUILD_OSG_PLUGINS_BY_DEFAULT OFF CACHE BOOL "") set(BUILD_OSG_PLUGIN_BMP ON CACHE BOOL "") + set(BUILD_OSG_PLUGIN_DAE ON CACHE BOOL "") set(BUILD_OSG_PLUGIN_DDS ON CACHE BOOL "") set(BUILD_OSG_PLUGIN_FREETYPE ON CACHE BOOL "") set(BUILD_OSG_PLUGIN_JPEG ON CACHE BOOL "") + set(BUILD_OSG_PLUGIN_KTX ON CACHE BOOL "") set(BUILD_OSG_PLUGIN_OSG ON CACHE BOOL "") set(BUILD_OSG_PLUGIN_PNG ON CACHE BOOL "") set(BUILD_OSG_PLUGIN_TGA ON CACHE BOOL "") - set(BUILD_OSG_PLUGIN_KTX ON CACHE BOOL "") set(OSG_USE_FLOAT_MATRIX ON CACHE BOOL "") set(OSG_USE_FLOAT_PLANE ON CACHE BOOL "")