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

Merge branch 'link_deps' into 'master'

Browse Source 
Add link dependencies to libosgSim and collada-dom

See merge request OpenMW/openmw!2514
This commit is contained in:
psi29a 2022-11-18 22:00:09 +00:00
commit 97e54c6294
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

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

3
components/CMakeLists.txt
View File

@ -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}