VERY experimental Nintendo Switch 2 emulator
C++
cmake: move find-modules to root cmake dir
Alexandre Bouviereac2672a41df
diff --git a/CMakeLists.txt b/CMakeLists.txtindex ed22187fd6..cee720940c 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -5,7 +5,6 @@ cmake_minimum_required(VERSION 3.22)list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/find-modules")include(DownloadExternals)include(CMakeDependentOption)diff --git a/externals/find-modules/FindDiscordRPC.cmake b/CMakeModules/FindDiscordRPC.cmakesimilarity index 100%rename from externals/find-modules/FindDiscordRPC.cmakerename to CMakeModules/FindDiscordRPC.cmakediff --git a/externals/find-modules/FindFFmpeg.cmake b/CMakeModules/FindFFmpeg.cmakesimilarity index 100%rename from externals/find-modules/FindFFmpeg.cmakerename to CMakeModules/FindFFmpeg.cmakediff --git a/externals/find-modules/FindOpus.cmake b/CMakeModules/FindOpus.cmakesimilarity index 100%rename from externals/find-modules/FindOpus.cmakerename to CMakeModules/FindOpus.cmakediff --git a/externals/find-modules/Findenet.cmake b/CMakeModules/Findenet.cmakesimilarity index 100%rename from externals/find-modules/Findenet.cmakerename to CMakeModules/Findenet.cmakediff --git a/externals/find-modules/Findhttplib.cmake b/CMakeModules/Findhttplib.cmakesimilarity index 100%rename from externals/find-modules/Findhttplib.cmakerename to CMakeModules/Findhttplib.cmakediff --git a/externals/find-modules/Findinih.cmake b/CMakeModules/Findinih.cmakesimilarity index 100%rename from externals/find-modules/Findinih.cmakerename to CMakeModules/Findinih.cmakediff --git a/externals/find-modules/Findlibusb.cmake b/CMakeModules/Findlibusb.cmakesimilarity index 100%rename from externals/find-modules/Findlibusb.cmakerename to CMakeModules/Findlibusb.cmakediff --git a/externals/find-modules/Findlz4.cmake b/CMakeModules/Findlz4.cmakesimilarity index 100%rename from externals/find-modules/Findlz4.cmakerename to CMakeModules/Findlz4.cmakediff --git a/externals/find-modules/Findzstd.cmake b/CMakeModules/Findzstd.cmakesimilarity index 100%rename from externals/find-modules/Findzstd.cmakerename to CMakeModules/Findzstd.cmakediff --git a/externals/cmake-modules/WindowsCopyFiles.cmake b/CMakeModules/WindowsCopyFiles.cmakesimilarity index 100%rename from externals/cmake-modules/WindowsCopyFiles.cmakerename to CMakeModules/WindowsCopyFiles.cmakediff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txtindex 54e3d7c6d8..dfd40cba67 100644--- a/externals/CMakeLists.txt+++ b/externals/CMakeLists.txt@@ -5,10 +5,6 @@# some of its variables, which is only possible in 3.13+set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)-list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules")-list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/externals/find-modules")-include(DownloadExternals)-# xbyakif ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak)add_subdirectory(xbyak EXCLUDE_FROM_ALL)diff --git a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txtindex 5bbe1d4b5d..136109a0c8 100644--- a/src/dedicated_room/CMakeLists.txt+++ b/src/dedicated_room/CMakeLists.txt@@ -1,8 +1,6 @@# SPDX-FileCopyrightText: 2017 Citra Emulator Project# SPDX-License-Identifier: GPL-2.0-or-later-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)-add_executable(yuzu-roomprecompiled_headers.hyuzu_room.cppdiff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txtindex 4a7d35617c..dfc675cc8f 100644--- a/src/yuzu/CMakeLists.txt+++ b/src/yuzu/CMakeLists.txt@@ -5,7 +5,6 @@ set(CMAKE_AUTOMOC ON)set(CMAKE_AUTORCC ON)set(CMAKE_AUTOUIC ON)set(CMAKE_INCLUDE_CURRENT_DIR ON)-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)# Set the RPATH for Qt Libraries# This must be done before the `yuzu` target is createddiff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txtindex 61b6cc4e0b..46eddf423f 100644--- a/src/yuzu_cmd/CMakeLists.txt+++ b/src/yuzu_cmd/CMakeLists.txt@@ -1,8 +1,6 @@# SPDX-FileCopyrightText: 2018 yuzu Emulator Project# SPDX-License-Identifier: GPL-2.0-or-later-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)-# Credits to Samantas5855 and others for this function.function(create_resource file output filename)# Read hex data from file