Skip to content

Commit f5269b6

Browse files
authored
update modern glslang (#5910)
* update modern glslang * fix build with cpp14
1 parent 9afeb17 commit f5269b6

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "glslang"]
22
path = glslang
3-
url = https://github.com/KhronosGroup/glslang
3+
url = https://github.com/nihui/glslang
44
[submodule "python/pybind11"]
55
path = python/pybind11
66
url = https://github.com/pybind/pybind11.git

CMakeLists.txt

+7-11
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,8 @@ endif()
755755
if(NCNN_VULKAN)
756756
if(NCNN_SYSTEM_GLSLANG)
757757
find_package(Threads)
758+
find_package(SPIRV-Tools QUIET)
759+
find_package(SPIRV-Tools-opt QUIET)
758760
find_package(glslang QUIET)
759761
if(glslang_FOUND)
760762
add_library(glslang ALIAS glslang::glslang)
@@ -777,7 +779,7 @@ if(NCNN_VULKAN)
777779
endif()
778780
endif()
779781

780-
if (TARGET glslang AND TARGET SPIRV)
782+
if(TARGET glslang AND TARGET SPIRV)
781783
get_property(glslang_location TARGET glslang PROPERTY LOCATION)
782784
get_property(SPIRV_location TARGET SPIRV PROPERTY LOCATION)
783785
message(STATUS "Found glslang: ${glslang_location} (found version \"${glslang_VERSION}\")")
@@ -803,23 +805,17 @@ if(NCNN_VULKAN)
803805
option(ENABLE_EXCEPTIONS "" OFF)
804806
option(ENABLE_OPT "" OFF)
805807
option(ENABLE_PCH "" OFF)
806-
option(ENABLE_CTEST "" OFF)
807-
if(NCNN_SHARED_LIB)
808-
option(SKIP_GLSLANG_INSTALL "" ON)
809-
endif()
808+
option(GLSLANG_TESTS "" OFF)
809+
option(GLSLANG_ENABLE_INSTALL "" ON)
810810
add_subdirectory(glslang)
811811
if(NCNN_SHARED_LIB)
812812
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES "MSVC"))
813813
target_compile_options(glslang PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden)
814-
target_compile_options(OGLCompiler PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden)
815-
target_compile_options(OSDependent PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden)
816-
target_compile_options(SPIRV PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden)
814+
target_compile_options(glslang-default-resource-limits PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden)
817815
endif()
818816
if(NCNN_ENABLE_LTO)
819817
set_target_properties(glslang PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
820-
set_target_properties(OGLCompiler PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
821-
set_target_properties(OSDependent PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
822-
set_target_properties(SPIRV PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
818+
set_target_properties(glslang-default-resource-limits PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
823819
endif()
824820
endif()
825821
endif()

cmake/ncnnConfig.cmake.in

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ if(NCNN_VULKAN)
2222

2323
if(NOT NCNN_SHARED_LIB)
2424
if(NCNN_SYSTEM_GLSLANG)
25+
find_package(SPIRV-Tools QUIET)
26+
find_package(SPIRV-Tools-opt QUIET)
2527
find_package(glslang QUIET)
2628
if(NOT glslang_FOUND)
2729
set(GLSLANG_TARGET_DIR "@GLSLANG_TARGET_DIR@")

glslang

Submodule glslang updated 963 files

0 commit comments

Comments
 (0)