diff --git a/CMakeLists.txt b/CMakeLists.txt index 42717c496d..1f000141f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,7 +130,6 @@ if (YUZU_STATIC_BUILD) # these libs do not properly provide static libs/let you do it with cmake set(fmt_FORCE_BUNDLED ON) - set(SPIRV-Tools_FORCE_BUNDLED ON) set(SPIRV-Headers_FORCE_BUNDLED ON) set(zstd_FORCE_BUNDLED ON) endif() @@ -523,7 +522,6 @@ if (NOT YUZU_STATIC_ROOM) find_package(VulkanMemoryAllocator) find_package(VulkanUtilityLibraries) find_package(SimpleIni) - find_package(SPIRV-Tools) find_package(sirit) find_package(gamemode) find_package(frozen) diff --git a/CMakeModules/FindSPIRV-Tools.cmake b/CMakeModules/FindSPIRV-Tools.cmake deleted file mode 100644 index e0f9a88d54..0000000000 --- a/CMakeModules/FindSPIRV-Tools.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project -# SPDX-License-Identifier: GPL-3.0-or-later - -# SPDX-FileCopyrightText: 2022 yuzu Emulator Project -# SPDX-License-Identifier: GPL-2.0-or-later - -include(FindPackageHandleStandardArgs) - -find_package(PkgConfig QUIET) -pkg_search_module(SPIRV-Tools QUIET IMPORTED_TARGET SPIRV-Tools) -find_package_handle_standard_args(SPIRV-Tools - REQUIRED_VARS SPIRV-Tools_LINK_LIBRARIES - VERSION_VAR SPIRV-Tools_VERSION -) - -if (PLATFORM_MSYS) - FixMsysPath(PkgConfig::SPIRV-Tools) -endif() - -if (SPIRV-Tools_FOUND AND NOT TARGET SPIRV-Tools::SPIRV-Tools) - if (TARGET SPIRV-Tools) - add_library(SPIRV-Tools::SPIRV-Tools ALIAS SPIRV-Tools) - else() - add_library(SPIRV-Tools::SPIRV-Tools ALIAS PkgConfig::SPIRV-Tools) - endif() -endif() diff --git a/src/shader_recompiler/CMakeLists.txt b/src/shader_recompiler/CMakeLists.txt index e91803c8c6..d02ee268f0 100644 --- a/src/shader_recompiler/CMakeLists.txt +++ b/src/shader_recompiler/CMakeLists.txt @@ -243,7 +243,7 @@ add_library(shader_recompiler STATIC ) -target_link_libraries(shader_recompiler PUBLIC common fmt::fmt sirit::sirit SPIRV-Tools::SPIRV-Tools) +target_link_libraries(shader_recompiler PUBLIC common fmt::fmt sirit::sirit) if (MSVC) target_compile_options(shader_recompiler PRIVATE