Skip to content

Revert "[cefdisplay] check system libvulkan" #24066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guitargeek merged 1 commit into from
Nov 9, 2026
Merged

Revert "[cefdisplay] check system libvulkan" #24066

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions gui/cefdisplay/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,13 @@ elseif(MSVC)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Frameworks/cef/locales)
file(COPY ${CEF_RESOURCES}/locales/ DESTINATION ${CMAKE_BINARY_DIR}/Frameworks/cef/locales)
else()
# check if libvulkan exists and avoid its copy from cef release dir
find_library(SYSTEM_VULKAN NAMES libvulkan.so.1 vulkan
PATHS /usr/lib64 /usr/lib /usr/lib/x86_64-linux-gnu /usr/lib/aarch64-linux-gnu
NO_DEFAULT_PATH)
set(_cef_exclude)
if(SYSTEM_VULKAN)
list(APPEND _cef_exclude PATTERN "libvulkan*" EXCLUDE)
endif()
set(CEF_platform src/gui_handler_linux.cxx)
set(CEF_RESOURCES ${CEF_root}/Resources)
set(CEF_RELEASE_DIR ${CEF_root}/Release)
set(CEF_LIBRARY ${CEF_RELEASE_DIR}/libcef.so)
set(CEF_DLL_WRAPPER ${CEF_root}/build/libcef_dll_wrapper/libcef_dll_wrapper.a)
set(CEF_LIB_DEPENDENCY ${X11_LIBRARIES})
file(COPY ${CEF_RELEASE_DIR}/ DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${_cef_exclude})
file(COPY ${CEF_RELEASE_DIR}/ DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
# copy shared libraries plus some extras to library directory to let CEF find them without extra configuration
file(COPY ${CEF_RESOURCES}/ DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} PATTERN "locales" EXCLUDE)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Frameworks/cef/locales)
Expand Down
Loading