diff options
Diffstat (limited to 'pkgs/development/compilers/glslang/install-headers.patch')
| -rw-r--r-- | pkgs/development/compilers/glslang/install-headers.patch | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/development/compilers/glslang/install-headers.patch b/pkgs/development/compilers/glslang/install-headers.patch index 9ad6f5e19068..75f271309780 100644 --- a/pkgs/development/compilers/glslang/install-headers.patch +++ b/pkgs/development/compilers/glslang/install-headers.patch @@ -1,21 +1,30 @@ diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index 48a6c46..593d941 100755 +index c538e84..6ece1ab 100755 --- a/SPIRV/CMakeLists.txt +++ b/SPIRV/CMakeLists.txt -@@ -42,3 +42,8 @@ endif(WIN32) +@@ -34,8 +34,9 @@ if(ENABLE_AMD_EXTENSIONS) + endif(ENABLE_AMD_EXTENSIONS) + + if(ENABLE_NV_EXTENSIONS) +- set(HEADERS +- GLSL.ext.NV.h) ++ list(APPEND ++ HEADERS ++ GLSL.ext.NV.h) + endif(ENABLE_NV_EXTENSIONS) + + add_library(SPIRV STATIC ${SOURCES} ${HEADERS}) +@@ -51,3 +52,5 @@ endif(WIN32) install(TARGETS SPIRV SPVRemapper ARCHIVE DESTINATION lib) + -+foreach(file ${HEADERS} ${SPVREMAP_HEADERS}) -+ get_filename_component(dir ${file} DIRECTORY) -+ install(FILES ${file} DESTINATION include/SPIRV/${dir}) -+endforeach() ++install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION include/SPIRV/) diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index ff91135..4318279 100644 +index 95d4bdd..e7fda90 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt -@@ -90,3 +90,8 @@ endif(WIN32) +@@ -93,3 +93,8 @@ endif(WIN32) install(TARGETS glslang ARCHIVE DESTINATION lib) |