Merge branch 'add_additional_osg_plugins' into 'master'

reorg of cmake osg plugins; add osgSim and osgdb_dae requirements

See merge request OpenMW/openmw!946

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

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