forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes NixOS#192617. The breakage is introduced by a glslang update. Now `${glslang}/lib/cmake/OSDependentTargets.cmake` points to `${glslang}/share/glslang/glslang-targets.cmake`. The latter requires the `SPIRV-Tools-opt` target. So the two lines in patch should be moved before `OSDependentTargets.cmake`. This also fixes a breakage introduced by cmake described in NixOS#144170.
- Loading branch information
Showing
2 changed files
with
21 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,26 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 98611276..989350bb 100644 | ||
index c453d23e..66b4aa24 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -260,6 +260,8 @@ if(NCNN_VULKAN) | ||
include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") | ||
endif() | ||
include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake") | ||
@@ -478,6 +478,8 @@ if(NCNN_VULKAN) | ||
|
||
find_package(Threads) | ||
|
||
+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") | ||
+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") | ||
include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake") | ||
|
||
if (NOT TARGET glslang OR NOT TARGET SPIRV) | ||
include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") | ||
include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") | ||
if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") | ||
diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in | ||
index b580fcee..be2becd0 100644 | ||
--- a/src/ncnn.pc.in | ||
+++ b/src/ncnn.pc.in | ||
@@ -1,6 +1,6 @@ | ||
prefix=${pcfiledir}/../.. | ||
-librarydir=${prefix}/@CMAKE_INSTALL_LIBDIR@ | ||
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ | ||
+librarydir=@CMAKE_INSTALL_FULL_LIBDIR@ | ||
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ | ||
|
||
Name: @CMAKE_PROJECT_NAME@ | ||
Description: high-performance neural network inference framework optimized for the mobile platform |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters