536e8c558e
Fixes #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 #144170.
27 lines
1 KiB
Diff
27 lines
1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c453d23e..66b4aa24 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -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}/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
|