update glslang (#4361)

Tencent · Nov 21, 2022 · f527fe8 · f527fe8
1 parent 0736c5b
commit f527fe8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/cmake/ncnnConfig.cmake.in b/cmake/ncnnConfig.cmake.in
@@ -19,20 +19,29 @@ if(NCNN_VULKAN)
 
     if(NOT NCNN_SHARED_LIB)
         if(NCNN_SYSTEM_GLSLANG)
-            set(GLSLANG_TARGET_DIR "@GLSLANG_TARGET_DIR@")
+            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_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()
         else()
-            set(GLSLANG_TARGET_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../@CMAKE_INSTALL_LIBDIR@/cmake")
-        endif(NCNN_SYSTEM_GLSLANG)
-
-        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")
+            set(glslang_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../@CMAKE_INSTALL_LIBDIR@/cmake/glslang")
+            find_package(glslang QUIET)
+            add_library(glslang ALIAS glslang::glslang)
+            add_library(SPIRV ALIAS glslang::SPIRV)
         endif()
-        include(${GLSLANG_TARGET_DIR}/glslangTargets.cmake)
-        include(${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake)
+
     endif()
-endif(NCNN_VULKAN)
+endif()
 
 include(${CMAKE_CURRENT_LIST_DIR}/ncnn.cmake)
diff --git a/glslang b/glslang