Fixed build with recent Vulkan SDK tarballs.

chrismile · Aug 24, 2023 · 5dc6bbf · 5dc6bbf
1 parent 33ac8da
commit 5dc6bbf
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 28 deletions.
diff --git a/.github/workflows/build-brew.yml b/.github/workflows/build-brew.yml
@@ -80,12 +80,14 @@ jobs:
             source "VulkanSDK/$(ls VulkanSDK)/setup-env.sh"
             # Fix pkgconfig file.
             shaderc_pkgconfig_file="VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig/shaderc.pc"
-            prefix_path=$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch")
-            #sed -i '3s;.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
-            #sed -i '5s;.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
-            sed -i '' 's;^prefix=.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
-            sed -i '' 's;^libdir=.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
-            export PKG_CONFIG_PATH="$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")"
+            if [ -f $shaderc_pkgconfig_file ]; then
+              prefix_path=$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch")
+              #sed -i '3s;.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
+              #sed -i '5s;.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
+              sed -i '' 's;^prefix=.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
+              sed -i '' 's;^libdir=.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
+              export PKG_CONFIG_PATH="$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")"
+            fi
           fi
         elif [ "$RUNNER_OS" == "macOS" ]; then
           vulkansdk_filename=$(curl -sIkL https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg | sed -r '/filename=/!d;s/.*filename=(.*)$/\1/')

diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -77,10 +77,12 @@ jobs:
           tar -xf vulkan-sdk.tar.gz -C VulkanSDK
           # Fix pkgconfig file.
           shaderc_pkgconfig_file="VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig/shaderc.pc"
-          prefix_path=$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch")
-          sed -i '3s;.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
-          sed -i '5s;.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
-          echo "PKG_CONFIG_PATH=\"$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")\"" >> $GITHUB_ENV
+          if [ -f $shaderc_pkgconfig_file ]; then
+            prefix_path=$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch")
+            sed -i '3s;.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
+            sed -i '5s;.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
+            echo "PKG_CONFIG_PATH=\"$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")\"" >> $GITHUB_ENV
+          fi
         fi
 
     - name: Download Embree

diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml
@@ -85,10 +85,12 @@ jobs:
             tar -xf vulkan-sdk.tar.gz -C VulkanSDK
             # Fix pkgconfig file.
             shaderc_pkgconfig_file="VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig/shaderc.pc"
-            prefix_path=$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch")
-            sed -i '3s;.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
-            sed -i '5s;.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
-            echo "PKG_CONFIG_PATH=\"$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")\"" >> $GITHUB_ENV
+            if [ -f $shaderc_pkgconfig_file ]; then
+              prefix_path=$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch")
+              sed -i '3s;.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
+              sed -i '5s;.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
+              echo "PKG_CONFIG_PATH=\"$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")\"" >> $GITHUB_ENV
+            fi
           fi
           # Also install the dependencies for building GLEW here.
           sudo apt install libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev

diff --git a/.github/workflows/test-volumetric-path-tracing.yml b/.github/workflows/test-volumetric-path-tracing.yml
@@ -58,10 +58,12 @@ jobs:
           tar -xf vulkan-sdk.tar.gz -C VulkanSDK
           # Fix pkgconfig file.
           shaderc_pkgconfig_file="VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig/shaderc.pc"
-          prefix_path=$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch")
-          sed -i '3s;.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
-          sed -i '5s;.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
-          echo "PKG_CONFIG_PATH=\"$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")\"" >> $GITHUB_ENV
+          if [ -f $shaderc_pkgconfig_file ]; then
+            prefix_path=$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch")
+            sed -i '3s;.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
+            sed -i '5s;.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
+            echo "PKG_CONFIG_PATH=\"$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")\"" >> $GITHUB_ENV
+          fi
         fi
 
     - name: Configure CMake (sgl)

diff --git a/build-linux-vcpkg.sh b/build-linux-vcpkg.sh
@@ -190,7 +190,10 @@ if [[ ! -v VULKAN_SDK ]]; then
     if [ -d "VulkanSDK" ]; then
         VK_LAYER_PATH=""
         source "VulkanSDK/$(ls VulkanSDK)/setup-env.sh"
-        export PKG_CONFIG_PATH="$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")"
+        pkgconfig_dir="$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")"
+        if [ -d "$pkgconfig_dir" ]; then
+            export PKG_CONFIG_PATH="$pkgconfig_dir"
+        fi
         found_vulkan=true
     fi
 
@@ -229,10 +232,12 @@ if [[ ! -v VULKAN_SDK ]]; then
 
         # Fix pkgconfig file.
         shaderc_pkgconfig_file="VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig/shaderc.pc"
-        prefix_path=$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch")
-        sed -i '3s;.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
-        sed -i '5s;.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
-        export PKG_CONFIG_PATH="$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")"
+        if [ -f "$shaderc_pkgconfig_file" ]; then
+            prefix_path=$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch")
+            sed -i '3s;.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
+            sed -i '5s;.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
+            export PKG_CONFIG_PATH="$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")"
+        fi
         found_vulkan=true
     fi
 

diff --git a/build-linux.sh b/build-linux.sh
@@ -232,7 +232,10 @@ if [[ ! -v VULKAN_SDK ]]; then
     if [ -d "VulkanSDK" ]; then
         VK_LAYER_PATH=""
         source "VulkanSDK/$(ls VulkanSDK)/setup-env.sh"
-        export PKG_CONFIG_PATH="$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")"
+        pkgconfig_dir="$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")"
+        if [ -d "$pkgconfig_dir" ]; then
+            export PKG_CONFIG_PATH="$pkgconfig_dir"
+        fi
         found_vulkan=true
     fi
 
@@ -271,10 +274,12 @@ if [[ ! -v VULKAN_SDK ]]; then
 
         # Fix pkgconfig file.
         shaderc_pkgconfig_file="VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig/shaderc.pc"
-        prefix_path=$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch")
-        sed -i '3s;.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
-        sed -i '5s;.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
-        export PKG_CONFIG_PATH="$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")"
+        if [ -f "$shaderc_pkgconfig_file" ]; then
+            prefix_path=$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch")
+            sed -i '3s;.*;prefix=\"'$prefix_path'\";' "$shaderc_pkgconfig_file"
+            sed -i '5s;.*;libdir=${prefix}/lib;' "$shaderc_pkgconfig_file"
+            export PKG_CONFIG_PATH="$(realpath "VulkanSDK/$(ls VulkanSDK)/$os_arch/lib/pkgconfig")"
+        fi
         found_vulkan=true
     fi