From c72059e73fb98e96b800cc5a423e6c0ec73f377f Mon Sep 17 00:00:00 2001 From: Router Gray Date: Wed, 26 Feb 2020 07:21:48 -0600 Subject: [PATCH] [CMake CEF] How was this even working? Set dependencies and link targets to cef instead of webkit. --- indra/newview/CMakeLists.txt | 2 +- indra/plugins/cef/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 299fdfbcf..550d2d11d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1823,7 +1823,7 @@ if (DARWIN) ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ) - add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc media_plugin_webkit basic_plugin_filepicker) + add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc media_plugin_cef basic_plugin_filepicker) if (PACKAGE) add_custom_target(llpackage ALL DEPENDS ${VIEWER_BINARY_NAME}) diff --git a/indra/plugins/cef/CMakeLists.txt b/indra/plugins/cef/CMakeLists.txt index 8c369fe0e..7847353d1 100644 --- a/indra/plugins/cef/CMakeLists.txt +++ b/indra/plugins/cef/CMakeLists.txt @@ -59,7 +59,7 @@ if (LINUX) else (PULSEAUDIO_FOUND) list(APPEND media_plugin_cef_SOURCE_FILES dummy_volume_catcher.cpp) endif (PULSEAUDIO_FOUND) - list(APPEND media_plugin_webkit_LINK_LIBRARIES + list(APPEND media_plugin_cef_LINK_LIBRARIES ${UI_LIBRARIES} # for glib/GTK ) elseif (DARWIN)