r

Author: nihui

CMakeLists.txt

@@ -757,13 +757,36 @@ if(NCNN_VULKAN)
         find_package(Threads)
         find_package(SPIRV-Tools QUIET)
         find_package(SPIRV-Tools-opt QUIET)
-        find_package(glslang)
+        find_package(glslang QUIET)
 
-        if(TARGET glslang::glslang)
-            get_property(glslang_location TARGET glslang::glslang PROPERTY LOCATION)
+        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()
+
+        if(TARGET glslang AND TARGET SPIRV)
+            get_property(glslang_location TARGET glslang PROPERTY LOCATION)
+            get_property(SPIRV_location TARGET SPIRV 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 target not found! NCNN_SYSTEM_GLSLANG will be turned off.")
+            message(WARNING "glslang or SPIRV target not found! NCNN_SYSTEM_GLSLANG will be turned off.")
             set(NCNN_SYSTEM_GLSLANG OFF)
         endif()
     endif()