diff --git a/CMakeLists.txt b/CMakeLists.txt index 706353e0d8..a5ba7e8fbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 55b5c3a81a..3d19f47ac7 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -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}