diff options
Diffstat (limited to 'dev-util/glslang/files')
-rw-r--r-- | dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch | 39 | ||||
-rw-r--r-- | dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch | 26 |
2 files changed, 0 insertions, 65 deletions
diff --git a/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch b/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch deleted file mode 100644 index 826e0f6cd856..000000000000 --- a/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt -index b44cbc73..41f6de93 100644 ---- a/OGLCompilersDLL/CMakeLists.txt -+++ b/OGLCompilersDLL/CMakeLists.txt -@@ -41,7 +41,7 @@ if(WIN32) - source_group("Source" FILES ${SOURCES}) - endif(WIN32) - --if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) -+if(ENABLE_GLSLANG_INSTALL) - install(TARGETS OGLCompiler EXPORT glslang-targets) - - # Backward compatibility -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index a8b14911..57ec1efd 100644 ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -203,7 +203,7 @@ endif() - ################################################################################ - if(ENABLE_GLSLANG_INSTALL) - install(TARGETS glslang EXPORT glslang-targets) -- if(NOT BUILD_SHARED_LIBS) -+ if(BUILD_SHARED_LIBS) - install(TARGETS MachineIndependent EXPORT glslang-targets) - install(TARGETS GenericCodeGen EXPORT glslang-targets) - -diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt -index 16eb939b..959788dc 100644 ---- a/glslang/OSDependent/Unix/CMakeLists.txt -+++ b/glslang/OSDependent/Unix/CMakeLists.txt -@@ -52,7 +52,7 @@ else() - target_link_libraries(OSDependent Threads::Threads) - endif() - --if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) -+if(ENABLE_GLSLANG_INSTALL) - install(TARGETS OSDependent EXPORT glslang-targets) - - # Backward compatibility diff --git a/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch b/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch deleted file mode 100644 index 3afcec329f07..000000000000 --- a/dev-util/glslang/files/glslang-1.3.238-Fix-cmake-targets.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index a80e74ed..8a15f00d 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -106,7 +106,7 @@ if(ENABLE_OPT) - target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) - target_include_directories(SPIRV PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> -- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>) -+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/>) - else() - target_link_libraries(SPIRV PRIVATE MachineIndependent) - endif() -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index ad88442c..db2ca5ff 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -69,7 +69,7 @@ endif() - target_link_libraries(glslang-standalone ${LIBRARIES}) - target_include_directories(glslang-standalone PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> -- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>) -+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) - - if(ENABLE_OPT) - target_include_directories(glslang-standalone |