From eceee8c3d930563e26841d556f9acb965eab67c8 Mon Sep 17 00:00:00 2001
From: Alexandre Bouvier <contact@amb.tf>
Date: Sat, 31 Dec 2022 14:23:38 +0100
Subject: [PATCH] cmake: move find-modules to root cmake dir

---
 CMakeLists.txt                                                | 1 -
 {externals/find-modules => CMakeModules}/FindDiscordRPC.cmake | 0
 {externals/find-modules => CMakeModules}/FindFFmpeg.cmake     | 0
 {externals/find-modules => CMakeModules}/FindOpus.cmake       | 0
 {externals/find-modules => CMakeModules}/Findenet.cmake       | 0
 {externals/find-modules => CMakeModules}/Findhttplib.cmake    | 0
 {externals/find-modules => CMakeModules}/Findinih.cmake       | 0
 {externals/find-modules => CMakeModules}/Findlibusb.cmake     | 0
 {externals/find-modules => CMakeModules}/Findlz4.cmake        | 0
 {externals/find-modules => CMakeModules}/Findzstd.cmake       | 0
 .../cmake-modules => CMakeModules}/WindowsCopyFiles.cmake     | 0
 externals/CMakeLists.txt                                      | 4 ----
 src/dedicated_room/CMakeLists.txt                             | 2 --
 src/yuzu/CMakeLists.txt                                       | 1 -
 src/yuzu_cmd/CMakeLists.txt                                   | 2 --
 15 files changed, 10 deletions(-)
 rename {externals/find-modules => CMakeModules}/FindDiscordRPC.cmake (100%)
 rename {externals/find-modules => CMakeModules}/FindFFmpeg.cmake (100%)
 rename {externals/find-modules => CMakeModules}/FindOpus.cmake (100%)
 rename {externals/find-modules => CMakeModules}/Findenet.cmake (100%)
 rename {externals/find-modules => CMakeModules}/Findhttplib.cmake (100%)
 rename {externals/find-modules => CMakeModules}/Findinih.cmake (100%)
 rename {externals/find-modules => CMakeModules}/Findlibusb.cmake (100%)
 rename {externals/find-modules => CMakeModules}/Findlz4.cmake (100%)
 rename {externals/find-modules => CMakeModules}/Findzstd.cmake (100%)
 rename {externals/cmake-modules => CMakeModules}/WindowsCopyFiles.cmake (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed22187fd..cee720940 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.cmake
similarity index 100%
rename from externals/find-modules/FindDiscordRPC.cmake
rename to CMakeModules/FindDiscordRPC.cmake
diff --git a/externals/find-modules/FindFFmpeg.cmake b/CMakeModules/FindFFmpeg.cmake
similarity index 100%
rename from externals/find-modules/FindFFmpeg.cmake
rename to CMakeModules/FindFFmpeg.cmake
diff --git a/externals/find-modules/FindOpus.cmake b/CMakeModules/FindOpus.cmake
similarity index 100%
rename from externals/find-modules/FindOpus.cmake
rename to CMakeModules/FindOpus.cmake
diff --git a/externals/find-modules/Findenet.cmake b/CMakeModules/Findenet.cmake
similarity index 100%
rename from externals/find-modules/Findenet.cmake
rename to CMakeModules/Findenet.cmake
diff --git a/externals/find-modules/Findhttplib.cmake b/CMakeModules/Findhttplib.cmake
similarity index 100%
rename from externals/find-modules/Findhttplib.cmake
rename to CMakeModules/Findhttplib.cmake
diff --git a/externals/find-modules/Findinih.cmake b/CMakeModules/Findinih.cmake
similarity index 100%
rename from externals/find-modules/Findinih.cmake
rename to CMakeModules/Findinih.cmake
diff --git a/externals/find-modules/Findlibusb.cmake b/CMakeModules/Findlibusb.cmake
similarity index 100%
rename from externals/find-modules/Findlibusb.cmake
rename to CMakeModules/Findlibusb.cmake
diff --git a/externals/find-modules/Findlz4.cmake b/CMakeModules/Findlz4.cmake
similarity index 100%
rename from externals/find-modules/Findlz4.cmake
rename to CMakeModules/Findlz4.cmake
diff --git a/externals/find-modules/Findzstd.cmake b/CMakeModules/Findzstd.cmake
similarity index 100%
rename from externals/find-modules/Findzstd.cmake
rename to CMakeModules/Findzstd.cmake
diff --git a/externals/cmake-modules/WindowsCopyFiles.cmake b/CMakeModules/WindowsCopyFiles.cmake
similarity index 100%
rename from externals/cmake-modules/WindowsCopyFiles.cmake
rename to CMakeModules/WindowsCopyFiles.cmake
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 54e3d7c6d..dfd40cba6 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)
-
 # xbyak
 if ((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.txt
index 5bbe1d4b5..136109a0c 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-room
     precompiled_headers.h
     yuzu_room.cpp
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 4a7d35617..dfc675cc8 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 created
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt
index 61b6cc4e0..46eddf423 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