[glslang] Update to 11.1.0 (#15719)

* [shaderc] remove port since it does not build

* [glslang] updated to version 11.1.0

* [glslang] Add python path

* [glslang] baseline.json and glslang.json updated

* Update portfile.cmake

* Update CONTROL

* Update port_versions

* Update port_versions

* Update port_versions

* Update port_versions

* Update port_versions

* [glslang] port update to version 11.4.0

* [glslang] port version removed from json

* [glslang] remove shaderc

* [glslang] baseline update

* [glslang] versions hash update

* [glslang] portfile format fix + use of ${PORT}

* [glslang] new hash

* [glslang] revert portfile back

* [glslang] portfile apply changes

* [glslang] update hash for x86 windows

* [glslang] update to 1.5.0

* [glslang] git-tree hash update

* [glslang] remove old version 1.4.0

* [glslang] git-tree hash update

* [glslang][shaderc] Update and fix targets to match upstream

* Update versions

Co-authored-by: Lukas Lipp <llipp@cg.tuwien.ac.at>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: JonLiu1993 <13720414433@163.com>
Co-authored-by: Robert Schumacher <ras0219@outlook.com>

7 files changed, 52 insertions, 145 deletions

diff --git a/ports/glslang/CMakeLists-targets.patch b/ports/glslang/CMakeLists-targets.patch
deleted file mode 100644
index 53cf5bf8f..000000000
--- a/ports/glslang/CMakeLists-targets.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff --git a/ChooseMSVCCRT.cmake b/ChooseMSVCCRT.cmake

-index 2097881..f6320a9 100644

---- a/ChooseMSVCCRT.cmake

-+++ b/ChooseMSVCCRT.cmake

-@@ -102,4 +102,3 @@ set(MSVC_CRT

-   MT

-   MTd)

- 

--choose_msvc_crt(MSVC_CRT)

-diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt

-index 5bb3f0e..90ba3be 100644

---- a/OGLCompilersDLL/CMakeLists.txt

-+++ b/OGLCompilersDLL/CMakeLists.txt

-@@ -9,6 +9,7 @@ if(WIN32)

- endif(WIN32)

- 

- if(ENABLE_GLSLANG_INSTALL)

--    install(TARGETS OGLCompiler

--            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

-+    install(TARGETS OGLCompiler EXPORT glslangConfig

-+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

-+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

- endif(ENABLE_GLSLANG_INSTALL)

-diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt

-index 1997e74..e2a0229 100644

---- a/SPIRV/CMakeLists.txt

-+++ b/SPIRV/CMakeLists.txt

-@@ -46,7 +46,6 @@ endif(ENABLE_NV_EXTENSIONS)

- add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})

- set_property(TARGET SPIRV PROPERTY FOLDER glslang)

- set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)

--target_include_directories(SPIRV PUBLIC ..)

- 

- if (ENABLE_SPVREMAPPER)

-     add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})

-@@ -78,13 +77,13 @@ if(WIN32)

- endif(WIN32)

- 

- if(ENABLE_GLSLANG_INSTALL)

--    if(BUILD_SHARED_LIBS)

-+    if(BUILD_SHARED_LIBS OR TRUE)

-         if (ENABLE_SPVREMAPPER)

-             install(TARGETS SPVRemapper

-                     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

-                     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

-         endif()

--        install(TARGETS SPIRV

-+        install(TARGETS SPIRV EXPORT glslangConfig

-                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

-                 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

-     else()

-diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt

-index 5f51476..7f11498 100644

---- a/glslang/CMakeLists.txt

-+++ b/glslang/CMakeLists.txt

-@@ -86,7 +86,6 @@ add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${H

- set_property(TARGET glslang PROPERTY FOLDER glslang)

- set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)

- target_link_libraries(glslang OGLCompiler OSDependent)

--target_include_directories(glslang PUBLIC ..)

- 

- if(WIN32 AND BUILD_SHARED_LIBS)

-     set_target_properties(glslang PROPERTIES PREFIX "")

-@@ -105,10 +104,15 @@ if(WIN32)

- endif(WIN32)

- 

- if(ENABLE_GLSLANG_INSTALL)

--    if(BUILD_SHARED_LIBS)

--        install(TARGETS glslang

-+    if(BUILD_SHARED_LIBS OR TRUE)

-+        install(TARGETS glslang EXPORT glslangConfig

-                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

-                 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

-+        install(

-+            EXPORT glslangConfig

-+            DESTINATION "${CMAKE_INSTALL_PREFIX}/share/glslang"

-+            NAMESPACE glslang::

-+            )

-     else()

-         install(TARGETS glslang

-                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

-diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt

-index e652f45..a9673fe 100644

---- a/glslang/OSDependent/Unix/CMakeLists.txt

-+++ b/glslang/OSDependent/Unix/CMakeLists.txt

-@@ -20,6 +20,6 @@ else()

- endif()

- 

- if(ENABLE_GLSLANG_INSTALL)

--    install(TARGETS OSDependent

-+    install(TARGETS OSDependent EXPORT glslangConfig

-             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

- endif(ENABLE_GLSLANG_INSTALL)

-diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt

-index f918d7a..329800f 100644

---- a/hlsl/CMakeLists.txt

-+++ b/hlsl/CMakeLists.txt

-@@ -32,8 +32,8 @@ if(WIN32)

- endif(WIN32)

- 

- if(ENABLE_GLSLANG_INSTALL)

--    if(BUILD_SHARED_LIBS)

--        install(TARGETS HLSL

-+    if(BUILD_SHARED_LIBS OR TRUE)

-+        install(TARGETS HLSL EXPORT glslangConfig

-                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

-                 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

-     else()

-diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
-index 5cea53d9..43e45534 100644
---- a/StandAlone/CMakeLists.txt
-+++ b/StandAlone/CMakeLists.txt
-@@ -46,7 +46,7 @@ if(ENABLE_GLSLANG_INSTALL)
-     install(TARGETS spirv-remap
-             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-             
--    if(BUILD_SHARED_LIBS)
-+    if(BUILD_SHARED_LIBS OR TRUE)
-         install(TARGETS glslang-default-resource-limits
-                 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-     endif()
diff --git a/ports/glslang/CMakeLists-windows.patch b/ports/glslang/CMakeLists-windows.patch
deleted file mode 100644
index 76ccf6077..000000000
--- a/ports/glslang/CMakeLists-windows.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt

-index f257418..82a3f3c 100644

---- a/glslang/OSDependent/Windows/CMakeLists.txt

-+++ b/glslang/OSDependent/Windows/CMakeLists.txt

-@@ -15,6 +15,6 @@ if(WIN32)

- endif(WIN32)

- 

- if(ENABLE_GLSLANG_INSTALL)

--    install(TARGETS OSDependent

-+    install(TARGETS OSDependent EXPORT glslangConfig

-             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

- endif(ENABLE_GLSLANG_INSTALL)

diff --git a/ports/glslang/always-install-resource-limits.patch b/ports/glslang/always-install-resource-limits.patch
new file mode 100644
index 000000000..56c34dfc4
--- /dev/null
+++ b/ports/glslang/always-install-resource-limits.patch
@@ -0,0 +1,13 @@
+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}
diff --git a/ports/glslang/glslang-config.cmake b/ports/glslang/glslang-config.cmake
new file mode 100644
index 000000000..5eb356151
--- /dev/null
+++ b/ports/glslang/glslang-config.cmake
@@ -0,0 +1,7 @@
+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()
diff --git a/ports/glslang/ignore-crt.patch b/ports/glslang/ignore-crt.patch
new file mode 100644
index 000000000..0835b49a9
--- /dev/null
+++ b/ports/glslang/ignore-crt.patch
@@ -0,0 +1,9 @@
+diff --git a/ChooseMSVCCRT.cmake b/ChooseMSVCCRT.cmake

+index b1561263..b6c8c3a6 100644

+--- a/ChooseMSVCCRT.cmake

++++ b/ChooseMSVCCRT.cmake

+@@ -135,4 +135,3 @@ set(MSVC_CRT

+   MT

+   MTd)

+ 

+-choose_msvc_crt(MSVC_CRT)

diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake
index da955a888..2ee7c9b3a 100644
--- a/ports/glslang/portfile.cmake
+++ b/ports/glslang/portfile.cmake
@@ -3,14 +3,18 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO KhronosGroup/glslang
-  REF f88e5824d2cfca5edc58c7c2101ec9a4ec36afac
-  SHA512 92dc287e8930db6e00bde23b770f763dc3cf8a405a37b682bbd65e1dbde1f1f5161543fcc70b09eef07a5ce8bbe8f368ef84ac75003c122f42d1f6b9eaa8bd50
+  REF ae2a562936cc8504c9ef2757cceaff163147834f
+  SHA512 1c5a91e60c1809c6c26f11649659090a75501b0570f3147e5b27ac65c539b591967f258d14c399d33019317864ede823353ea44e0015bc3f7afc5a787f046cc7
   HEAD_REF master
   PATCHES
-    CMakeLists-targets.patch
-    CMakeLists-windows.patch
+    ignore-crt.patch
+    always-install-resource-limits.patch
 )
 
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY)
+vcpkg_add_to_path("${PYTHON_PATH}")
+
 if(VCPKG_TARGET_IS_IOS)
   # this case will report error since all executable will require BUNDLE DESTINATION
   set(BUILD_BINARIES OFF)
@@ -22,24 +26,32 @@ vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
   OPTIONS
-    -DCMAKE_DEBUG_POSTFIX=d
     -DSKIP_GLSLANG_INSTALL=OFF
+    -DBUILD_EXTERNAL=OFF
     -DENABLE_GLSLANG_BINARIES=${BUILD_BINARIES}
 )
 
 vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/glslang)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/glslang)
 
 vcpkg_copy_pdbs()
 
 if(NOT BUILD_BINARIES)
   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
 else()
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools)
+  file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/glslang)
 endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
                     ${CURRENT_PACKAGES_DIR}/debug/bin)
 
-# Handle copyright
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/glslang)
+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}/copyright
+  ${CMAKE_CURRENT_LIST_DIR}/glslang-config.cmake
+  DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+)
+
diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json
index 24579e689..addd408f3 100644
--- a/ports/glslang/vcpkg.json
+++ b/ports/glslang/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "glslang",
-  "version-string": "2019-03-05",
-  "port-version": 3,
+  "version": "11.5.0",
   "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator",
   "homepage": "https://github.com/KhronosGroup/glslang"
 }