at 24.11-pre 35 lines 1.4 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 785e2cd..459024d 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -589,7 +589,8 @@ endif() 6 if(NCNN_VULKAN) 7 if(NCNN_SYSTEM_GLSLANG) 8 find_package(Threads) 9- find_package(glslang QUIET) 10+ find_package(SPIRV-Tools-opt REQUIRED) 11+ find_package(glslang REQUIRED) 12 if(glslang_FOUND) 13 add_library(glslang ALIAS glslang::glslang) 14 add_library(SPIRV ALIAS glslang::SPIRV) 15@@ -601,7 +602,6 @@ if(NCNN_VULKAN) 16 set(NCNN_SYSTEM_GLSLANG OFF) 17 else() 18 include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") 19- include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") 20 if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") 21 # hlsl support can be optional 22 include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") 23diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in 24index b580fce..be2becd 100644 25--- a/src/ncnn.pc.in 26+++ b/src/ncnn.pc.in 27@@ -1,6 +1,6 @@ 28 prefix=${pcfiledir}/../.. 29-librarydir=${prefix}/@CMAKE_INSTALL_LIBDIR@ 30-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ 31+librarydir=@CMAKE_INSTALL_FULL_LIBDIR@ 32+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ 33 34 Name: @CMAKE_PROJECT_NAME@ 35 Description: high-performance neural network inference framework optimized for the mobile platform