mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-16 17:29:55 +00:00
Add link dependencies to libosgSim and collada-dom
This commit is contained in:
parent
ff142b6009
commit
89884fae0b
2 changed files with 5 additions and 1 deletions
|
@ -265,6 +265,7 @@ set(USED_OSG_PLUGINS
|
|||
osgdb_serializers_osg
|
||||
osgdb_tga)
|
||||
|
||||
find_package(collada_dom)
|
||||
|
||||
option(OPENMW_USE_SYSTEM_ICU "Use system ICU library instead of internal. If disabled, requires autotools" ON)
|
||||
if(OPENMW_USE_SYSTEM_ICU)
|
||||
|
@ -491,7 +492,7 @@ include_directories(
|
|||
${ICU_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
link_directories(${SDL2_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
|
||||
link_directories(${SDL2_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS} ${COLLADA_DOM_LIBRARY_DIRS})
|
||||
|
||||
if(MYGUI_STATIC)
|
||||
add_definitions(-DMYGUI_STATIC)
|
||||
|
|
|
@ -399,6 +399,8 @@ find_package(SQLite3 REQUIRED)
|
|||
add_library(components STATIC ${COMPONENT_FILES})
|
||||
|
||||
target_link_libraries(components
|
||||
${COLLADA_DOM_LIBRARIES}
|
||||
|
||||
# CMake's built-in OSG finder does not use pkgconfig, so we have to
|
||||
# manually ensure the order is correct for inter-library dependencies.
|
||||
# This only makes a difference with `-DOPENMW_USE_SYSTEM_OSG=ON -DOSG_STATIC=ON`.
|
||||
|
@ -411,6 +413,7 @@ target_link_libraries(components
|
|||
${OSGTEXT_LIBRARIES}
|
||||
${OSGDB_LIBRARIES}
|
||||
${OSGUTIL_LIBRARIES}
|
||||
${OSGSIM_LIBRARIES}
|
||||
${OSG_LIBRARIES}
|
||||
${OPENTHREADS_LIBRARIES}
|
||||
|
||||
|
|
Loading…
Reference in a new issue