fixing the patch

OGRECave · May 21, 2024 · e1737e8 · e1737e8
1 parent c52cfa1
commit e1737e8
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/PlugIns/GLSLang/CMakeLists.txt b/PlugIns/GLSLang/CMakeLists.txt
@@ -19,20 +19,21 @@ elseif(DEFINED ENV{VULKAN_SDK})
  target_link_directories(Plugin_GLSLangProgramManager PUBLIC $ENV{VULKAN_SDK}/lib)
  target_link_libraries(Plugin_GLSLangProgramManager PUBLIC OgreMain shaderc_combined)
 else()
- find_library(HLSL HLSL)
- find_library(OGLCompiler OGLCompiler)
- if(HLSL AND OGLCompiler)
- set(GLSLANG_LIBS glslang HLSL OSDependent OGLCompiler SPIRV SPIRV-Tools-opt SPIRV-Tools)
- else()
- set(GLSLANG_LIBS glslang OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools)
+ set(GLSLANG_LIBS glslang OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools)
+ find_library(GLSLANG_HLSL HLSL)
+ if(GLSLANG_HLSL)
+ set(GLSLANG_LIBS ${GLSLANG_HLSL} ${GLSLANG_LIBS})
  endif()
- find_library(GLSLANG_MI MachineIndependent)
- if(GLSLANG_MI)
- set(GLSLANG_LIBS ${GLSLANG_MI} ${GLSLANG_LIBS})
- endif()
- target_link_libraries(Plugin_GLSLangProgramManager PUBLIC OgreMain ${GLSLANG_LIBS})
+ find_library(GLSLANG_OGLCompiler OGLCompiler)
+ if(GLSLANG_OGLCompiler)
+ set(GLSLANG_LIBS ${GLSLANG_OGLCompiler} ${GLSLANG_LIBS})
+ endif()
+ find_library(GLSLANG_MI MachineIndependent)
+ if(GLSLANG_MI)
+ set(GLSLANG_LIBS ${GLSLANG_MI} ${GLSLANG_LIBS})
+ endif()
+ target_link_libraries(Plugin_GLSLangProgramManager PUBLIC OgreMain ${GLSLANG_LIBS})
 endif()
-
 ogre_config_framework(Plugin_GLSLangProgramManager)
 ogre_config_plugin(Plugin_GLSLangProgramManager)
 generate_export_header(Plugin_GLSLangProgramManager