From 4982dcfaa54ef236e1a3e0a753c8d5e80407a881 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 27 Sep 2025 01:02:49 +0200 Subject: [PATCH] [cmake] Use siritConfig instead of the module (#2593) Tested together with https://github.com/eden-emulator/sirit/pull/2 Signed-off-by: Marcin Serwin Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2593 Reviewed-by: crueter Reviewed-by: MaranBr Co-authored-by: Marcin Serwin Co-committed-by: Marcin Serwin --- CMakeModules/Findsirit.cmake | 11 ----------- externals/cpmfile.json | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 CMakeModules/Findsirit.cmake diff --git a/CMakeModules/Findsirit.cmake b/CMakeModules/Findsirit.cmake deleted file mode 100644 index 83b81b09c5..0000000000 --- a/CMakeModules/Findsirit.cmake +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project -# SPDX-License-Identifier: GPL-3.0-or-later - -include(FindPackageHandleStandardArgs) - -find_package(PkgConfig QUIET) -pkg_search_module(sirit QUIET IMPORTED_TARGET sirit) -find_package_handle_standard_args(sirit - REQUIRED_VARS sirit_LINK_LIBRARIES - VERSION_VAR sirit_VERSION -) diff --git a/externals/cpmfile.json b/externals/cpmfile.json index 283da76743..dcafc8f97d 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -10,7 +10,7 @@ "repo": "eden-emulator/sirit", "sha": "db1f1e8ab5", "hash": "73eb3a042848c63a10656545797e85f40d142009dfb7827384548a385e1e28e1ac72f42b25924ce530d58275f8638554281e884d72f9c7aaf4ed08690a414b05", - "find_args": "MODULE", + "find_args": "CONFIG", "options": [ "SIRIT_USE_SYSTEM_SPIRV_HEADERS ON" ]