Selaa lähdekoodia

cmake: move find-modules to root cmake dir

Alexandre Bouvier 3 vuotta sitten
vanhempi
commit
eceee8c3d9

+ 0 - 1
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)
 

+ 0 - 0
externals/find-modules/FindDiscordRPC.cmake → CMakeModules/FindDiscordRPC.cmake


+ 0 - 0
externals/find-modules/FindFFmpeg.cmake → CMakeModules/FindFFmpeg.cmake


+ 0 - 0
externals/find-modules/FindOpus.cmake → CMakeModules/FindOpus.cmake


+ 0 - 0
externals/find-modules/Findenet.cmake → CMakeModules/Findenet.cmake


+ 0 - 0
externals/find-modules/Findhttplib.cmake → CMakeModules/Findhttplib.cmake


+ 0 - 0
externals/find-modules/Findinih.cmake → CMakeModules/Findinih.cmake


+ 0 - 0
externals/find-modules/Findlibusb.cmake → CMakeModules/Findlibusb.cmake


+ 0 - 0
externals/find-modules/Findlz4.cmake → CMakeModules/Findlz4.cmake


+ 0 - 0
externals/find-modules/Findzstd.cmake → CMakeModules/Findzstd.cmake


+ 0 - 0
externals/cmake-modules/WindowsCopyFiles.cmake → CMakeModules/WindowsCopyFiles.cmake


+ 0 - 4
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)

+ 0 - 2
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

+ 0 - 1
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

+ 0 - 2
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