diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-03 15:58:53 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-03 15:58:53 -0400 |
commit | 18083bad5cd1915a92e1650bc273db6a52100c6b (patch) | |
tree | 5eec5167387d6465a73bb05d6551c5b667d93bec /indra/media_plugins | |
parent | 9930e22ac5a16aff16bf334c92a3505322b2936e (diff) | |
parent | 614c75e1107c9b06b2e2c663e2c6411d1fcd21f2 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'indra/media_plugins')
-rw-r--r-- | indra/media_plugins/example/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/media_plugins/example/CMakeLists.txt b/indra/media_plugins/example/CMakeLists.txt index 42eb378172..6f5b28b8e9 100644 --- a/indra/media_plugins/example/CMakeLists.txt +++ b/indra/media_plugins/example/CMakeLists.txt @@ -60,7 +60,9 @@ target_link_libraries(media_plugin_example add_dependencies(media_plugin_example ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} - ${LLCOMMON_LIBRARIES} + # Using ${LLCOMMON_LIBRARIES} here drags in a whole bunch of Boost stuff + # that only produces CMake warnings about nonexistent dependencies. + llcommon ) if (WINDOWS) |