646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 7e4da27..85cf911 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -106,20 +106,13 @@ if(USE_SYSTEM_NCNN)
|
|
message(STATUS "Using glslang install located at ${GLSLANG_TARGET_DIR}")
|
|
|
|
find_package(Threads)
|
|
+ find_package(glslang REQUIRED)
|
|
+ find_package(SPIRV-Tools-opt REQUIRED)
|
|
|
|
- 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")
|
|
-
|
|
- if (NOT TARGET glslang OR NOT TARGET SPIRV)
|
|
- message(WARNING "glslang or SPIRV target not found! USE_SYSTEM_NCNN will be turned off.")
|
|
- set(USE_SYSTEM_NCNN OFF)
|
|
- endif()
|
|
endif()
|
|
endif()
|
|
|