fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-22 09:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Meta: Add vulkan and vulkan-headers to vcpkg dependencies

Browse Source 
Also require a specific ICU version to not run into unexpected problems.
This commit is contained in:
Andrew Kaster
2024-07-05 16:12:52 -06:00
committed by Alexander Kalenik
parent c84ff9f693
commit bd97442771
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/actions/setup/action.yml vendored
View File

@@ -25,7 +25,9 @@ runs:
sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update sudo apt-get update
sudo apt-get install autoconf autoconf-archive automake build-essential cmake libavcodec-dev fonts-liberation2 zip curl tar ccache clang-18 clang++-18 lld-18 gcc-13 g++-13 libstdc++-13-dev ninja-build unzip qt6-base-dev qt6-tools-dev-tools libqt6svg6-dev qt6-multimedia-dev libgl1-mesa-dev libpulse-dev libssl-dev libegl1-mesa-dev sudo apt-get install autoconf autoconf-archive automake build-essential cmake libavcodec-dev fonts-liberation2 zip curl tar ccache clang-18 clang++-18 lld-18 gcc-13 g++-13 libstdc++-13-dev \
ninja-build unzip qt6-base-dev qt6-tools-dev-tools libqt6svg6-dev qt6-multimedia-dev libgl1-mesa-dev libpulse-dev libssl-dev libegl1-mesa-dev \
libx11-dev libxrandr-dev
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100 sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100

3
Meta/CMake/vulkan.cmake
View File

@@ -1,6 +1,7 @@
if (NOT APPLE) if (NOT APPLE)
find_package(VulkanHeaders CONFIG QUIET)
find_package(Vulkan QUIET) find_package(Vulkan QUIET)
if (Vulkan_FOUND) if (VulkanHeaders_FOUND AND Vulkan_FOUND)
set(HAS_VULKAN ON CACHE BOOL "" FORCE) set(HAS_VULKAN ON CACHE BOOL "" FORCE)
add_compile_definitions(USE_VULKAN=1) add_compile_definitions(USE_VULKAN=1)
endif() endif()

3
Userland/Libraries/LibCore/CMakeLists.txt
View File

@@ -82,7 +82,6 @@ else()
endif() endif()
if (HAS_VULKAN) if (HAS_VULKAN)
include_directories(${Vulkan_INCLUDE_DIR})
list(APPEND SOURCES VulkanContext.cpp) list(APPEND SOURCES VulkanContext.cpp)
endif() endif()
@@ -112,5 +111,5 @@ if (ANDROID)
endif() endif()
if (HAS_VULKAN) if (HAS_VULKAN)
target_link_libraries(LibCore PUBLIC ${Vulkan_LIBRARIES}) target_link_libraries(LibCore PUBLIC Vulkan::Vulkan Vulkan::Headers)
endif() endif()

2
Userland/Libraries/LibUnicode/CMakeLists.txt
View File

@@ -26,5 +26,5 @@ set(GENERATED_SOURCES ${CURRENT_LIB_GENERATED})
serenity_lib(LibUnicode unicode) serenity_lib(LibUnicode unicode)
find_package(ICU REQUIRED COMPONENTS data i18n uc) find_package(ICU 74 REQUIRED COMPONENTS data i18n uc)
target_link_libraries(LibUnicode PRIVATE ICU::i18n ICU::uc ICU::data) target_link_libraries(LibUnicode PRIVATE ICU::i18n ICU::uc ICU::data)

10
vcpkg.json
View File

@@ -32,7 +32,15 @@
"platform": "android" "platform": "android"
}, },
"sqlite3", "sqlite3",
"woff2" "woff2",
{
"name": "vulkan",
"platform": "!android"
},
{
"name": "vulkan-headers",
"platform": "!android"
}
], ],
"overrides": [ "overrides": [
{ {