[ci] Remove bundled volk

inexorgame · Jul 20, 2024 · f29ed26 · f29ed26
1 parent 5d9b6a7
commit f29ed26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -66,6 +66,7 @@ jobs:
             libwayland-dev \
             libx11-dev \
             libx11-xcb-dev \
+            libxkbcommon-dev \
             libxcb-dri3-dev \
             libxcb-icccm4-dev \
             libxcb-image0-dev \
@@ -76,7 +77,6 @@ jobs:
             libxcb-shape0-dev \
             libxcb-sync-dev \
             libxcb-util-dev \
-            libxkbcommon-dev \
             libxcb-xfixes0-dev \
             libxcb-xinerama0-dev \
             libxcb-xkb-dev \
@@ -100,6 +100,8 @@ jobs:
           rm -rf vulkansdk.tar.xz
           # runtime depenedencies
           apt-get -y install qtbase5-dev libxcb-xinput0 libxcb-xinerama0
+          # remove bundled volk
+          rm -rf ${{ env.INEXOR_VULKAN_SDK_PATH }}/${{ env.INEXOR_VULKAN_VERSION }}/x86_64/lib/cmake/volk/
 
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -137,7 +137,6 @@ FetchContent_MakeAvailable(tinygltf)
 FetchContent_MakeAvailable(toml)
 FetchContent_MakeAvailable(vma)
 FetchContent_MakeAvailable(volk)
-# FetchContent_MakeAvailable(Vulkan)
 
 target_link_libraries(inexor-vulkan-renderer
     PUBLIC
@@ -148,6 +147,5 @@ target_link_libraries(inexor-vulkan-renderer
     spdlog::spdlog_header_only
     tinygltf
     toml11::toml11
-    volk::volk
-    Vulkan::Headers
+    volk::volk_headers
     VulkanMemoryAllocator)