mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 07:06:45 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix-osg-plugins-dir' into 'master'

Browse source 
Fix OSGPlugins_LIB_DIR on the MacOS build

See merge request OpenMW/openmw!615
This commit is contained in:
psi29a 2021-02-20 00:26:17 +00:00
commit 07740982ce
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -316,14 +316,6 @@ endif()
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)
unset(OSGPlugins_LIB_DIR)
foreach(OSGDB_LIB ${OSGDB_LIBRARY})
# Skip library type names
if(EXISTS ${OSGDB_LIB} AND NOT IS_DIRECTORY ${OSGDB_LIB})
get_filename_component(OSG_LIB_DIR ${OSGDB_LIB} DIRECTORY)
list(APPEND OSGPlugins_LIB_DIR "${OSG_LIB_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}")
endif()
endforeach(OSGDB_LIB)
find_package(OSGPlugins REQUIRED COMPONENTS ${USED_OSG_PLUGINS}) find_package(OSGPlugins REQUIRED COMPONENTS ${USED_OSG_PLUGINS})
endif() endif()
endif() endif()

11
cmake/FindOSGPlugins.cmake
View file

@ -15,6 +15,17 @@
include(LibFindMacros) include(LibFindMacros)
include(Findosg_functions) include(Findosg_functions)
if (NOT OSGPlugins_LIB_DIR)
unset(OSGPlugins_LIB_DIR)
foreach(OSGDB_LIB ${OSGDB_LIBRARY})
# Skip library type names
if(EXISTS ${OSGDB_LIB} AND NOT IS_DIRECTORY ${OSGDB_LIB})
get_filename_component(OSG_LIB_DIR ${OSGDB_LIB} DIRECTORY)
list(APPEND OSGPlugins_LIB_DIR "${OSG_LIB_DIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}")
endif()
endforeach(OSGDB_LIB)
endif()
if (NOT OSGPlugins_LIB_DIR) if (NOT OSGPlugins_LIB_DIR)
set(_mode WARNING) set(_mode WARNING)
if (OSGPlugins_FIND_REQUIRED) if (OSGPlugins_FIND_REQUIRED)