Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CMake CEF] How was this even working? Set dependencies and link targets to cef instead of webkit.

Browse Source
This commit is contained in:
Router Gray
2020-02-26 07:21:48 -06:00
parent 2fc2b7c12b
commit c72059e73f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/CMakeLists.txt
View File

@@ -1823,7 +1823,7 @@ if (DARWIN)
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ${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) if (PACKAGE)
add_custom_target(llpackage ALL DEPENDS ${VIEWER_BINARY_NAME}) add_custom_target(llpackage ALL DEPENDS ${VIEWER_BINARY_NAME})

2
indra/plugins/cef/CMakeLists.txt
View File

@@ -59,7 +59,7 @@ if (LINUX)
else (PULSEAUDIO_FOUND) else (PULSEAUDIO_FOUND)
list(APPEND media_plugin_cef_SOURCE_FILES dummy_volume_catcher.cpp) list(APPEND media_plugin_cef_SOURCE_FILES dummy_volume_catcher.cpp)
endif (PULSEAUDIO_FOUND) endif (PULSEAUDIO_FOUND)
list(APPEND media_plugin_webkit_LINK_LIBRARIES list(APPEND media_plugin_cef_LINK_LIBRARIES
${UI_LIBRARIES} # for glib/GTK ${UI_LIBRARIES} # for glib/GTK
) )
elseif (DARWIN) elseif (DARWIN)