tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 7e4da27..85cf911 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -106,20 +106,13 @@ if(USE_SYSTEM_NCNN)
6 message(STATUS "Using glslang install located at ${GLSLANG_TARGET_DIR}")
7
8 find_package(Threads)
9+ find_package(glslang REQUIRED)
10+ find_package(SPIRV-Tools-opt REQUIRED)
11
12- include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
13- include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")
14 if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
15 # hlsl support can be optional
16 include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
17 endif()
18- include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake")
19- include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake")
20-
21- if (NOT TARGET glslang OR NOT TARGET SPIRV)
22- message(WARNING "glslang or SPIRV target not found! USE_SYSTEM_NCNN will be turned off.")
23- set(USE_SYSTEM_NCNN OFF)
24- endif()
25 endif()
26 endif()
27