mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-21 18:40:01 +00:00
Code Issues Projects Releases Wiki Activity

cmake: Move USED_OSG_(COMPONENTS|PLUGINS) from extern to top-level

Browse Source
This commit is contained in:
Gleb Mazovetskiy 2021-01-20 19:03:54 +00:00
parent 99ba45a308
commit 93fe84aea8
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@ -272,6 +272,25 @@ if(NOT HAVE_STDINT_H)
message(FATAL_ERROR "stdint.h was not found" ) message(FATAL_ERROR "stdint.h was not found" )
endif() 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) if(OPENMW_USE_SYSTEM_OSG)
find_package(OpenSceneGraph 3.3.4 REQUIRED ${USED_OSG_COMPONENTS}) find_package(OpenSceneGraph 3.3.4 REQUIRED ${USED_OSG_COMPONENTS})
if(OSG_STATIC) if(OSG_STATIC)

21
extern/CMakeLists.txt vendored
View File

@ -70,27 +70,6 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI)
set(MyGUI_LIBRARIES MyGUIEngine PARENT_SCOPE) set(MyGUI_LIBRARIES MyGUIEngine PARENT_SCOPE)
endif() 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) if(NOT OPENMW_USE_SYSTEM_OSG)
set(OSG_STATIC ON CACHE BOOL "") set(OSG_STATIC ON CACHE BOOL "")