diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-12-06 12:22:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-12-06 12:22:55 -0500 |
| commit | 59f2055c8d99afb1a5ff9ac998b08f0383365e00 (patch) | |
| tree | 51515f9c0ff1013a9ffa60be10addc2c36a86d87 /indra/media_plugins/libvlc/CMakeLists.txt | |
| parent | 295a4c63b4912f05a729178e8e34ba26e92ff37b (diff) | |
| parent | 780120dc46e6b99135bfd68dfdc05bd3e133208c (diff) | |
merge changes for latest fixes from nat
Diffstat (limited to 'indra/media_plugins/libvlc/CMakeLists.txt')
| -rw-r--r-- | indra/media_plugins/libvlc/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt index 32574c7afa..72159f9f69 100644 --- a/indra/media_plugins/libvlc/CMakeLists.txt +++ b/indra/media_plugins/libvlc/CMakeLists.txt @@ -61,7 +61,17 @@ target_link_libraries(media_plugin_libvlc add_dependencies(media_plugin_libvlc ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} - ${LLCOMMON_LIBRARIES} +##${LLCOMMON_LIBRARIES} + # Just say 'llcommon' here. LLCOMMON_LIBRARIES is specified for use in + # target_link_libraries: it includes several Boost libraries, which are + # absolutely NOT dependencies in the sense intended here. Those Boost + # library macros, in turn, specify 'debug' and 'optimized' and a different + # library name for each, producing several wordy errors: + # Policy CMP0046 is not set: Error on non-existent dependency in + # add_dependencies. + # Really, the only dependency we should mention from LLCOMMON_LIBRARIES is + # llcommon itself. + llcommon ) if (WINDOWS) |