From 8c47ab6f4ac538f22756d9554a425b1a124a4dfb Mon Sep 17 00:00:00 2001 From: kaizhangNV <149626564+kaizhangNV@users.noreply.github.com> Date: Wed, 7 Feb 2024 09:32:21 -0800 Subject: [PATCH] Update linux-x86_64.yml --- .github/{workflow => workflows}/linux-x86_64.yml | 4 +++- dependencies.xml | 4 ++++ external/CMakeLists.txt | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) rename .github/{workflow => workflows}/linux-x86_64.yml (67%) diff --git a/.github/workflow/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml similarity index 67% rename from .github/workflow/linux-x86_64.yml rename to .github/workflows/linux-x86_64.yml index 854b6ca..9f47e82 100644 --- a/.github/workflow/linux-x86_64.yml +++ b/.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 index 5ba8975..fa504c0 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -5,4 +5,8 @@ + + + + diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index d6452ac..7a1bcdf 100644 --- 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)