Update linux-x86_64.yml

shader-slang · Feb 8, 2024 · 8c47ab6 · 8c47ab6
1 parent 8861fc9
commit 8c47ab6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflow/linux-x86_64.yml → .github/workflows/linux-x86_64.yml b/.github/workflow/linux-x86_64.yml → .github/workflows/linux-x86_64.yml
@@ -13,9 +13,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: Install prerequisite
+      run: sudo apt-get install ninja-build
     - name: configure
       run: cmake --preset linux-gcc
     - name: make
       run: cmake --build build/linux-gcc
     - name: run test
-      run: _GL_SHADER_DISK_CACHE=0 ./build/linux-gcc/bin/Debug/falcor_perftest
+      run: __GL_SHADER_DISK_CACHE=0 ./build/linux-gcc/bin/Debug/falcor_perftest
diff --git a/dependencies.xml b/dependencies.xml
@@ -5,4 +5,8 @@
         <package name="slang" version="2024.0.0" remotes="github-slang-windows" platforms="windows-x86_64"/>
         <package name="slang" version="2024.0.0" remotes="github-slang-linux" platforms="linux-x86_64" />
     </dependency>
+    <dependency name="slang" linkPath="external/packman/vulkansdk">
+        <package name="vulkansdk" version="1.1.73.0-win" platforms="windows-x86_64" />
+        <package name="vulkansdk" version="1.1.73.0-linux-x86_64" platforms="linux-x86_64" />
+    </dependency>
 </project>
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -5,7 +5,6 @@
 # external_includes
 add_library(external_includes INTERFACE)
 target_include_directories(external_includes INTERFACE include)
-
 # -----------------------------------------------------------------------------
 # Dependencies in packman
 # -----------------------------------------------------------------------------
@@ -50,3 +49,6 @@ elseif(FALCOR_LINUX)
         IMPORTED_LOCATION ${SLANG_DIR}/bin/linux-x64/${FALCOR_SLANG_CONFIG}/libgfx.so
     )
 endif()
+
+set(VULKAN_DIR ${PACKMAN_DIR}/vulkansdk)
+target_include_directories(external_includes INTERFACE ${VULKAN_DIR}/include)