at 23.11-beta 26 lines 1.2 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index c453d23e..66b4aa24 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -560,6 +560,8 @@ if(NCNN_VULKAN) 6 message(WARNING "GLSLANG_TARGET_DIR must be defined! NCNN_SYSTEM_GLSLANG will be turned off.") 7 set(NCNN_SYSTEM_GLSLANG OFF) 8 else() 9+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") 10+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") 11 include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") 12 include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") 13 if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") 14diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in 15index b580fcee..be2becd0 100644 16--- a/src/ncnn.pc.in 17+++ b/src/ncnn.pc.in 18@@ -1,6 +1,6 @@ 19 prefix=${pcfiledir}/../.. 20-librarydir=${prefix}/@CMAKE_INSTALL_LIBDIR@ 21-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ 22+librarydir=@CMAKE_INSTALL_FULL_LIBDIR@ 23+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ 24 25 Name: @CMAKE_PROJECT_NAME@ 26 Description: high-performance neural network inference framework optimized for the mobile platform