diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt

index ada2b8fb9..90c3dafaf 100644

--- a/glslang/CMakeLists.txt

+++ b/glslang/CMakeLists.txt

@@ -320,10 +320,6 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External)

     add_subdirectory(External)

 endif()

-if(NOT TARGET SPIRV-Tools-opt)

-    set(ENABLE_OPT OFF)

-endif()

-

 if(ENABLE_OPT)

     message(STATUS "optimizer enabled")

     add_definitions(-DENABLE_OPT=1)

diff --git a/glslang/SPIRV/CMakeLists.txt b/glslang/SPIRV/CMakeLists.txt

index d699daddb..fbe92c2c7 100644

--- a/glslang/SPIRV/CMakeLists.txt

+++ b/glslang/SPIRV/CMakeLists.txt

@@ -91,14 +91,7 @@ if(WIN32 AND BUILD_SHARED_LIBS)

 endif()

 if(ENABLE_OPT)

-    target_include_directories(SPIRV

-        PRIVATE ${spirv-tools_SOURCE_DIR}/include

-        PRIVATE ${spirv-tools_SOURCE_DIR}/source

-    )

-    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>)

+    target_link_libraries(SPIRV PRIVATE MachineIndependent -lSPIRV-Tools-opt -lSPIRV-Tools-shared)

 else()

     target_link_libraries(SPIRV PRIVATE MachineIndependent)

 endif(ENABLE_OPT)