summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/cef/CMakeLists.txt11
-rw-r--r--indra/media_plugins/quicktime/CMakeLists.txt7
2 files changed, 6 insertions, 12 deletions
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 388030c979..db471c7906 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -2,6 +2,7 @@
project(media_plugin_cef)
+include(Boost)
include(00-Common)
include(LLCommon)
include(LLImage)
@@ -52,8 +53,8 @@ set(media_plugin_cef_HEADER_FILES
set (media_plugin_cef_LINK_LIBRARIES
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
- ${LLCOMMON_LIBRARIES}
${CEF_PLUGIN_LIBRARIES}
+ ${LLCOMMON_LIBRARIES}
${PLUGIN_API_WINDOWS_LIBRARIES})
@@ -84,11 +85,9 @@ add_library(media_plugin_cef
${media_plugin_cef_SOURCE_FILES}
)
-add_dependencies(media_plugin_cef
- ${LLPLUGIN_LIBRARIES}
- ${MEDIA_PLUGIN_BASE_LIBRARIES}
- ${LLCOMMON_LIBRARIES}
-)
+#add_dependencies(media_plugin_cef
+# ${MEDIA_PLUGIN_BASE_LIBRARIES}
+#)
target_link_libraries(media_plugin_cef
${media_plugin_cef_LINK_LIBRARIES}
diff --git a/indra/media_plugins/quicktime/CMakeLists.txt b/indra/media_plugins/quicktime/CMakeLists.txt
index d7a1874bf3..c5615145be 100644
--- a/indra/media_plugins/quicktime/CMakeLists.txt
+++ b/indra/media_plugins/quicktime/CMakeLists.txt
@@ -14,6 +14,7 @@ include(PluginAPI)
include(MediaPluginBase)
include(OpenGL)
include(QuickTimePlugin)
+include(Boost)
include_directories(
${LLPLUGIN_INCLUDE_DIRS}
@@ -53,12 +54,6 @@ target_link_libraries(media_plugin_quicktime
${PLUGIN_API_WINDOWS_LIBRARIES}
)
-add_dependencies(media_plugin_quicktime
- ${LLPLUGIN_LIBRARIES}
- ${MEDIA_PLUGIN_BASE_LIBRARIES}
- ${LLCOMMON_LIBRARIES}
-)
-
if (WINDOWS)
set_target_properties(
media_plugin_quicktime