Tweaked the cmake and workflow
Some checks failed
Build VulkanEngine / build (push) Failing after 42s
Some checks failed
Build VulkanEngine / build (push) Failing after 42s
This commit is contained in:
parent
6ebe7143a8
commit
663d7ed70a
@ -22,14 +22,9 @@ jobs:
|
|||||||
sudo apt install -y \
|
sudo apt install -y \
|
||||||
cmake \
|
cmake \
|
||||||
ninja-build \
|
ninja-build \
|
||||||
pkg-config \
|
|
||||||
g++ \
|
|
||||||
git \
|
|
||||||
curl \
|
curl \
|
||||||
tar \
|
|
||||||
\
|
\
|
||||||
libvulkan-dev \
|
libvulkan-dev \
|
||||||
libvulkan1 \
|
|
||||||
vulkan-validationlayers \
|
vulkan-validationlayers \
|
||||||
vulkan-tools \
|
vulkan-tools \
|
||||||
vulkan-utility-libraries-dev \
|
vulkan-utility-libraries-dev \
|
||||||
@ -49,24 +44,6 @@ jobs:
|
|||||||
libxkbcommon-dev \
|
libxkbcommon-dev \
|
||||||
libpulse-dev
|
libpulse-dev
|
||||||
|
|
||||||
- name: Install vk-bootstrap
|
|
||||||
run: |
|
|
||||||
git clone --depth 1 https://github.com/charles-lunarg/vk-bootstrap.git /tmp/vk-bootstrap
|
|
||||||
|
|
||||||
cmake \
|
|
||||||
-S /tmp/vk-bootstrap \
|
|
||||||
-B /tmp/vk-bootstrap/build \
|
|
||||||
-G Ninja \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DVK_BOOTSTRAP_TEST=OFF \
|
|
||||||
-DVK_BOOTSTRAP_INSTALL=ON
|
|
||||||
|
|
||||||
cmake \
|
|
||||||
--build /tmp/vk-bootstrap/build
|
|
||||||
|
|
||||||
sudo cmake \
|
|
||||||
--install /tmp/vk-bootstrap/build
|
|
||||||
|
|
||||||
- name: Install Slang
|
- name: Install Slang
|
||||||
run: |
|
run: |
|
||||||
SLANG_VERSION="2026.19"
|
SLANG_VERSION="2026.19"
|
||||||
@ -138,4 +115,4 @@ jobs:
|
|||||||
curl \
|
curl \
|
||||||
-H "Title: [Routine] VulkanEngine build" \
|
-H "Title: [Routine] VulkanEngine build" \
|
||||||
-d "Build finished (status: ${{ job.status }})" \
|
-d "Build finished (status: ${{ job.status }})" \
|
||||||
https://ntfy.alexdelcamp.fr/FlakeBuild
|
https://ntfy.alexdelcamp.fr/FlakeBuild
|
||||||
|
|||||||
@ -52,6 +52,13 @@ FetchContent_Declare(
|
|||||||
)
|
)
|
||||||
FetchContent_MakeAvailable(fastgltf)
|
FetchContent_MakeAvailable(fastgltf)
|
||||||
|
|
||||||
|
FetchContent_Declare(
|
||||||
|
fetch_vk_bootstrap
|
||||||
|
GIT_REPOSITORY https://github.com/charles-lunarg/vk-bootstrap
|
||||||
|
GIT_TAG v1.4.364
|
||||||
|
)
|
||||||
|
FetchContent_MakeAvailable(fetch_vk_bootstrap)
|
||||||
|
|
||||||
# Helper functions to build shaders
|
# Helper functions to build shaders
|
||||||
function(addGlslShader SOURCE OUTPUT_DIR)
|
function(addGlslShader SOURCE OUTPUT_DIR)
|
||||||
get_filename_component(SHADER_NAME ${SOURCE} NAME_WE)
|
get_filename_component(SHADER_NAME ${SOURCE} NAME_WE)
|
||||||
@ -221,7 +228,7 @@ list(
|
|||||||
# Libs used
|
# Libs used
|
||||||
glfw
|
glfw
|
||||||
fmt::fmt
|
fmt::fmt
|
||||||
vk-bootstrap
|
vk-bootstrap::vk-bootstrap
|
||||||
vulkan
|
vulkan
|
||||||
CLI11::CLI11
|
CLI11::CLI11
|
||||||
fastgltf
|
fastgltf
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user