From 93fe84aea8921a87f7aaf7fc949b425324a3c276 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Wed, 20 Jan 2021 19:03:54 +0000 Subject: [PATCH] cmake: Move USED_OSG_(COMPONENTS|PLUGINS) from extern to top-level --- CMakeLists.txt | 19 +++++++++++++++++++ extern/CMakeLists.txt | 21 --------------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be1f4dae4..f883aecfc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,6 +272,25 @@ if(NOT HAVE_STDINT_H) message(FATAL_ERROR "stdint.h was not found" ) endif() +set(USED_OSG_COMPONENTS + osgDB + osgViewer + osgText + osgGA + osgParticle + osgUtil + osgFX + osgShadow + osgAnimation) +set(USED_OSG_PLUGINS + osgdb_bmp + osgdb_dds + osgdb_freetype + osgdb_jpeg + osgdb_osg + osgdb_png + osgdb_serializers_osg + osgdb_tga) if(OPENMW_USE_SYSTEM_OSG) find_package(OpenSceneGraph 3.3.4 REQUIRED ${USED_OSG_COMPONENTS}) if(OSG_STATIC) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index f5743307a..b426ac4bf 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -70,27 +70,6 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI) set(MyGUI_LIBRARIES MyGUIEngine PARENT_SCOPE) endif() -set(USED_OSG_COMPONENTS - osgDB - osgViewer - osgText - osgGA - osgParticle - osgUtil - osgFX - osgShadow - osgAnimation) -set(USED_OSG_COMPONENTS ${USED_OSG_COMPONENTS} PARENT_SCOPE) -set(USED_OSG_PLUGINS - osgdb_bmp - osgdb_dds - osgdb_freetype - osgdb_jpeg - osgdb_osg - osgdb_png - osgdb_serializers_osg - osgdb_tga) -set(USED_OSG_PLUGINS ${USED_OSG_PLUGINS} PARENT_SCOPE) if(NOT OPENMW_USE_SYSTEM_OSG) set(OSG_STATIC ON CACHE BOOL "")