update modern glslang

Author: nihui

CMakeLists.txt

@@ -755,35 +755,15 @@ endif()
 if(NCNN_VULKAN)
     if(NCNN_SYSTEM_GLSLANG)
         find_package(Threads)
-        find_package(glslang QUIET)
-        if(glslang_FOUND)
-            add_library(glslang ALIAS glslang::glslang)
-            add_library(SPIRV ALIAS glslang::SPIRV)
-        else()
-            set(GLSLANG_TARGET_DIR "GLSLANG-NOTFOUND" CACHE PATH "Absolute path to glslangTargets.cmake directory")
-            if(NOT GLSLANG_TARGET_DIR AND NOT DEFINED ENV{GLSLANG_TARGET_DIR})
-                message(WARNING "set glslang_DIR to glslang-config.cmake directory for using system glslang.")
-                message(WARNING "GLSLANG_TARGET_DIR must be defined! NCNN_SYSTEM_GLSLANG will be turned off.")
-                set(NCNN_SYSTEM_GLSLANG OFF)
-            else()
-                include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
-                include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")
-                if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
-                    # hlsl support can be optional
-                    include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
-                endif()
-                include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake")
-                include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake")
-            endif()
-        endif()
+        find_package(SPIRV-Tools QUIET)
+        find_package(SPIRV-Tools-opt QUIET)
+        find_package(glslang)
 
-        if (TARGET glslang AND TARGET SPIRV)
-            get_property(glslang_location TARGET glslang PROPERTY LOCATION)
-            get_property(SPIRV_location TARGET SPIRV PROPERTY LOCATION)
+        if(TARGET glslang::glslang)
+            get_property(glslang_location TARGET glslang::glslang PROPERTY LOCATION)
             message(STATUS "Found glslang: ${glslang_location} (found version \"${glslang_VERSION}\")")
-            message(STATUS "Found SPIRV: ${SPIRV_location} (found version \"${glslang_VERSION}\")")
         else()
-            message(WARNING "glslang or SPIRV target not found! NCNN_SYSTEM_GLSLANG will be turned off.")
+            message(WARNING "glslang target not found! NCNN_SYSTEM_GLSLANG will be turned off.")
             set(NCNN_SYSTEM_GLSLANG OFF)
         endif()
     endif()
@@ -803,23 +783,17 @@ if(NCNN_VULKAN)
             option(ENABLE_EXCEPTIONS "" OFF)
             option(ENABLE_OPT "" OFF)
             option(ENABLE_PCH "" OFF)
-            option(ENABLE_CTEST "" OFF)
-            if(NCNN_SHARED_LIB)
-                option(SKIP_GLSLANG_INSTALL "" ON)
-            endif()
+            option(GLSLANG_TESTS "" OFF)
+            option(GLSLANG_ENABLE_INSTALL "" ON)
             add_subdirectory(glslang)
             if(NCNN_SHARED_LIB)
                 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES "MSVC"))
-                    target_compile_options(glslang PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden)
-                    target_compile_options(OGLCompiler PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden)
-                    target_compile_options(OSDependent PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden)
-                    target_compile_options(SPIRV PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden)
+                    target_compile_options(glslang::glslang PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden)
+                    target_compile_options(glslang::glslang-default-resource-limits PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden)
                 endif()
                 if(NCNN_ENABLE_LTO)
-                    set_target_properties(glslang PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
-                    set_target_properties(OGLCompiler PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
-                    set_target_properties(OSDependent PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
-                    set_target_properties(SPIRV PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
+                    set_target_properties(glslang::glslang PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
+                    set_target_properties(glslang::glslang-default-resource-limits PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
                 endif()
             endif()
         endif()

cmake/ncnnConfig.cmake.in

@@ -22,18 +22,9 @@ if(NCNN_VULKAN)
 
     if(NOT NCNN_SHARED_LIB)
         if(NCNN_SYSTEM_GLSLANG)
-            find_package(glslang QUIET)
-            if(NOT glslang_FOUND)
-                set(GLSLANG_TARGET_DIR "@GLSLANG_TARGET_DIR@")
-                include(${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake)
-                include(${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake)
-                if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
-                    # hlsl support can be optional
-                    include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
-                endif()
-                include(${GLSLANG_TARGET_DIR}/glslangTargets.cmake)
-                include(${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake)
-            endif()
+            find_package(SPIRV-Tools QUIET)
+            find_package(SPIRV-Tools-opt QUIET)
+            find_package(glslang REQUIRED)
         else()
             set(glslang_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../@CMAKE_INSTALL_LIBDIR@/cmake/glslang")
             find_package(glslang QUIET)

glslang

@@ -330,7 +330,7 @@ if(NCNN_VULKAN)
 
     # link in-house glslang
     target_include_directories(ncnn PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>)
-    target_link_libraries(ncnn PRIVATE glslang SPIRV)
+    target_link_libraries(ncnn PRIVATE glslang::glslang)
 endif()
 
 if(NCNN_PLATFORM_API AND ANDROID)