From 1efa3e4965ac08aec86d7f5e5af2acf4d16e67e2 Mon Sep 17 00:00:00 2001
From: Aaron Barany <akb825@gmail.com>
Date: Sun, 10 Nov 2024 16:52:45 -0800
Subject: [PATCH] Incremented version to 1.7.6.

Updated SPIRV-Cross, SPIRV-Tools, and glslang to the latest release
versions. Updated boost and gtest versions used in CI.
---
 .github/workflows/main.yml                | 10 +++++-----
 CMakeLists.txt                            |  2 +-
 Compile/SPIRV-Cross                       |  2 +-
 Compile/SPIRV-Tools                       |  2 +-
 Compile/glslang                           |  2 +-
 Compile/include/MSL/Compile/TargetMetal.h |  1 -
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d90f0c0..6755599 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,14 +9,14 @@ on:
 env:
   CTEST_OUTPUT_ON_FAILURE: '1'
   GTEST_OUTPUT: xml:${{ github.workspace }}/test-results/
-  boost_version: 1.84.0
+  boost_version: 1.86.0
   cmake_common_args: >-
     -DCMAKE_FIND_ROOT_PATH=${{ github.workspace }}/dependencies
     -DCMAKE_PREFIX_PATH=${{ github.workspace }}/dependencies
   cores_count: '4'
   cores_mac_count: '3'
   dependency_location: "${{ github.workspace }}/dependencies"
-  gtest_version: release-1.12.1
+  gtest_version: v1.15.2
   msvc_version: 14.2
   msvc_toolset: 142
   test_results_location: "${{ github.workspace }}/test-results"
@@ -134,7 +134,7 @@ jobs:
     - name: Publish test results
       uses: EnricoMi/publish-unit-test-result-action/macos@v2
       with:
-        check_name: Tests( Mac ${{ matrix.lib_type }} Debug)
+        check_name: Tests (Mac ${{ matrix.lib_type }} Debug)
         junit_files: "${{ env.test_results_location }}/*.xml"
     - name: Clear test results
       run: rm *.xml
@@ -155,7 +155,7 @@ jobs:
     - name: Publish test results
       uses: EnricoMi/publish-unit-test-result-action/macos@v2
       with:
-        check_name: Mac-${{ matrix.lib_type }}-Release
+        check_name: Mac (${{ matrix.lib_type }} Release)
         junit_files: "${{ env.test_results_location }}/*.xml"
   Windows:
     runs-on: windows-latest
@@ -192,7 +192,7 @@ jobs:
         max_attempts: 5
         command: |-
           $underscoreVersion = "${{ env.boost_version }}".replace(".", "_")
-          $url = "https://sourceforge.net/projects/boost/files/boost-binaries/${{ env.boost_version }}/boost_$underscoreVersion-msvc-${{ env.msvc_version }}-${{ matrix.bits }}.exe"
+          $url = "https://versaweb.dl.sourceforge.net/project/boost/boost-binaries/${{ env.boost_version }}/boost_$underscoreVersion-msvc-${{ env.msvc_version }}-${{ matrix.bits }}.exe"
           (New-Object System.Net.WebClient).DownloadFile($url, "$env:TEMP\boost.exe")
           Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=D:\boost"
     - name: Checkout gtest
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 588af60..263ad3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ endif()
 
 set(MSL_MAJOR_VERSION 1)
 set(MSL_MINOR_VERSION 7)
-set(MSL_PATCH_VERSION 5)
+set(MSL_PATCH_VERSION 6)
 set(MSL_VERSION ${MSL_MAJOR_VERSION}.${MSL_MINOR_VERSION}.${MSL_PATCH_VERSION})
 
 set(MSL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Compile/SPIRV-Cross b/Compile/SPIRV-Cross
index 2a7c818..a018347 160000
--- a/Compile/SPIRV-Cross
+++ b/Compile/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit 2a7c8184921897ff3d6c6c3f70af4099e2e00331
+Subproject commit a0183472e012867077e09c7531693e30388752b2
diff --git a/Compile/SPIRV-Tools b/Compile/SPIRV-Tools
index a864e53..0926045 160000
--- a/Compile/SPIRV-Tools
+++ b/Compile/SPIRV-Tools
@@ -1 +1 @@
-Subproject commit a864e5317136820efdb64093ee74b7b08122a137
+Subproject commit 0926045afc98a5d545cec9c580e1656ff55e7cc9
diff --git a/Compile/glslang b/Compile/glslang
index 7429d0e..44998f5 160000
--- a/Compile/glslang
+++ b/Compile/glslang
@@ -1 +1 @@
-Subproject commit 7429d0ebe43de0f2f4cb7d0b109163dbdfe982c9
+Subproject commit 44998f58b5f70f9ad6f3ec83a7bd918c6728a1ad
diff --git a/Compile/include/MSL/Compile/TargetMetal.h b/Compile/include/MSL/Compile/TargetMetal.h
index 5a3ff4d..00fa022 100644
--- a/Compile/include/MSL/Compile/TargetMetal.h
+++ b/Compile/include/MSL/Compile/TargetMetal.h
@@ -19,7 +19,6 @@
 #include <MSL/Config.h>
 #include <MSL/Compile/Export.h>
 #include <MSL/Compile/Target.h>
-#include <map>
 
 /**
  * @file