mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-20 19:16:11 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 1e7b71a..2ac2826 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()
|
|
|