[glslang] Bump version to 11.11.0 (#26671)

* Bump glslang port to 11.11.0

* Fix sha to match the one shown on the microsoft build server

* Fix portfile issues (at least for Windows)

* Potentially fix shaderc port

* update shaderc version

* shaderc appears to require Threads?

* change shaderc port version?

* fix local port-version

* Added custom usage as per PR suggestion!

* Updated glslang port tree version hash

ports/glslang/always-install-resource-limits.patch

@@ -1,13 +0,0 @@
-diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
-index 751d1cd71..0f5cf0dc0 100644
---- a/StandAlone/CMakeLists.txt
-+++ b/StandAlone/CMakeLists.txt
-@@ -98,7 +98,7 @@ if(ENABLE_GLSLANG_INSTALL)
-         install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-     endif()
- 
--    if(BUILD_SHARED_LIBS)
-+    if(BUILD_SHARED_LIBS OR TRUE)
-         install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets
-                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

ports/glslang/glslang-config.cmake

@@ -1,7 +0,0 @@
-include(CMakeFindDependencyMacro)
-
-find_dependency(Threads)
-
-foreach(targets OGLCompiler OSDependent glslang glslang-default-resource-limits glslangValidator HLSL SPIRV spirv-remap SPVRemapper)
-    include("${CMAKE_CURRENT_LIST_DIR}/${targets}Targets.cmake" OPTIONAL)
-endforeach()

ports/glslang/portfile.cmake

@@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO KhronosGroup/glslang
-  REF 11.8.0
-  SHA512 b60d328fab6d5319e49fbf8aeb86c31a7c8dfb4bc75d39c081cbb72f90750fd98f2a4f3ab091614187ad9e0d2e27471f9dab7ca5547cabb856d17bff694f8c98
+  REF 11.11.0
+  SHA512 c018271d499efff03540e4572a9c2f1f752c81c87efe7f2e63c2631ac47cecfedffdcfee68eddaf9187603eaae8ccd9a3e5640a022ba9fd7d05950f7827bf8cd
   HEAD_REF master
   PATCHES
     ignore-crt.patch
-    always-install-resource-limits.patch
 )
 
 vcpkg_find_acquire_program(PYTHON3)
@@ -43,13 +42,7 @@ endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
                     "${CURRENT_PACKAGES_DIR}/debug/bin")
 
-if(EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslang-config.cmake" OR EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslangConfig.cmake")
-  message(FATAL_ERROR "glslang has been updated to provide a -config file -- please remove the vcpkg provided version from the portfile")
-endif()
-
-file(COPY
-  "${CMAKE_CURRENT_LIST_DIR}/glslang-config.cmake"
-  DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-)
+# Install custom usage
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
 
 file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

ports/glslang/usage

@@ -0,0 +1,4 @@
+The package glslang provides CMake targets:
+
+    find_package(glslang CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE glslang::OSDependent glslang::glslang glslang::MachineIndependent glslang::GenericCodeGen glslang::OGLCompiler glslang::glslangValidator glslang::spirv-remap glslang::glslang-default-resource-limits glslang::SPVRemapper glslang::SPIRV glslang::HLSL)

ports/glslang/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "glslang",
-  "version": "11.8.0",
+  "version": "11.11.0",
   "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator",
   "homepage": "https://github.com/KhronosGroup/glslang",
   "dependencies": [

ports/shaderc/glslang/CMakeLists.txt

@@ -2,12 +2,21 @@ cmake_minimum_required(VERSION 3.11)
 
 find_package(glslang CONFIG REQUIRED)
 
-set_property(TARGET glslang PROPERTY IMPORTED_GLOBAL TRUE)
-set_property(TARGET OSDependent PROPERTY IMPORTED_GLOBAL TRUE)
-set_property(TARGET OGLCompiler PROPERTY IMPORTED_GLOBAL TRUE)
-set_property(TARGET HLSL PROPERTY IMPORTED_GLOBAL TRUE)
-set_property(TARGET SPIRV PROPERTY IMPORTED_GLOBAL TRUE)
-set_property(TARGET MachineIndependent PROPERTY IMPORTED_GLOBAL TRUE)
+set_property(TARGET glslang::glslang PROPERTY IMPORTED_GLOBAL TRUE)
+set_property(TARGET glslang::OSDependent PROPERTY IMPORTED_GLOBAL TRUE)
+set_property(TARGET glslang::OGLCompiler PROPERTY IMPORTED_GLOBAL TRUE)
+set_property(TARGET glslang::HLSL PROPERTY IMPORTED_GLOBAL TRUE)
+set_property(TARGET glslang::SPIRV PROPERTY IMPORTED_GLOBAL TRUE)
+set_property(TARGET glslang::MachineIndependent PROPERTY IMPORTED_GLOBAL TRUE)
+
+add_library(glslang ALIAS glslang::glslang)
+add_library(OSDependent ALIAS glslang::OSDependent)
+add_library(OGLCompiler ALIAS glslang::OGLCompiler)
+add_library(HLSL ALIAS glslang::HLSL)
+add_library(SPIRV ALIAS glslang::SPIRV)
+add_library(MachineIndependent ALIAS glslang::MachineIndependent)
+
+find_package(Threads REQUIRED)
 
 find_path(glslang_SOURCE_DIR glslang/Public/ShaderLang.h)
 set(glslang_SOURCE_DIR "${glslang_SOURCE_DIR}/glslang" "${glslang_SOURCE_DIR}" CACHE STRING "" FORCE)

ports/shaderc/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "shaderc",
   "version": "2021.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A collection of tools, libraries and tests for shader compilation.",
   "homepage": "https://github.com/google/shaderc",
   "license": "Apache-2.0",

versions/baseline.json

@@ -2641,7 +2641,7 @@
       "port-version": 0
     },
     "glslang": {
-      "baseline": "11.8.0",
+      "baseline": "11.11.0",
       "port-version": 0
     },
     "glui": {
@@ -6686,7 +6686,7 @@
     },
     "shaderc": {
       "baseline": "2021.1",
-      "port-version": 2
+      "port-version": 3
     },
     "shaderwriter": {
       "baseline": "2.4.0",

versions/g-/glslang.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "15f0fd6fda1d1a10fb5e605b3e38cb66ec7b5011",
+      "version": "11.11.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4d7780995e9523d16a56714fcef0159f18ecfa52",
       "version": "11.8.0",

versions/s-/shaderc.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d93e78fd464f2f378c8faf94e40e16410e1c41e0",
+      "version": "2021.1",
+      "port-version": 3
+    },
     {
       "git-tree": "376570ffd232d9c4e0dad095ae3dea964dec52ed",
       "version": "2021.1",