diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | CMakeModules/FindDiscordRPC.cmake (renamed from externals/find-modules/FindDiscordRPC.cmake) | 0 | ||||
| -rw-r--r-- | CMakeModules/FindFFmpeg.cmake (renamed from externals/find-modules/FindFFmpeg.cmake) | 0 | ||||
| -rw-r--r-- | CMakeModules/FindOpus.cmake (renamed from externals/find-modules/FindOpus.cmake) | 0 | ||||
| -rw-r--r-- | CMakeModules/Findenet.cmake (renamed from externals/find-modules/Findenet.cmake) | 0 | ||||
| -rw-r--r-- | CMakeModules/Findhttplib.cmake (renamed from externals/find-modules/Findhttplib.cmake) | 0 | ||||
| -rw-r--r-- | CMakeModules/Findinih.cmake (renamed from externals/find-modules/Findinih.cmake) | 0 | ||||
| -rw-r--r-- | CMakeModules/Findlibusb.cmake (renamed from externals/find-modules/Findlibusb.cmake) | 0 | ||||
| -rw-r--r-- | CMakeModules/Findlz4.cmake (renamed from externals/find-modules/Findlz4.cmake) | 0 | ||||
| -rw-r--r-- | CMakeModules/Findzstd.cmake (renamed from externals/find-modules/Findzstd.cmake) | 0 | ||||
| -rw-r--r-- | CMakeModules/WindowsCopyFiles.cmake (renamed from externals/cmake-modules/WindowsCopyFiles.cmake) | 0 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/dedicated_room/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/yuzu_cmd/CMakeLists.txt | 2 |
15 files changed, 0 insertions, 10 deletions
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 index 44ca9904f..44ca9904f 100644 --- a/externals/find-modules/FindDiscordRPC.cmake +++ b/CMakeModules/FindDiscordRPC.cmake diff --git a/externals/find-modules/FindFFmpeg.cmake b/CMakeModules/FindFFmpeg.cmake index eedf28aea..eedf28aea 100644 --- a/externals/find-modules/FindFFmpeg.cmake +++ b/CMakeModules/FindFFmpeg.cmake diff --git a/externals/find-modules/FindOpus.cmake b/CMakeModules/FindOpus.cmake index 25a44fd87..25a44fd87 100644 --- a/externals/find-modules/FindOpus.cmake +++ b/CMakeModules/FindOpus.cmake diff --git a/externals/find-modules/Findenet.cmake b/CMakeModules/Findenet.cmake index 859a6f386..859a6f386 100644 --- a/externals/find-modules/Findenet.cmake +++ b/CMakeModules/Findenet.cmake diff --git a/externals/find-modules/Findhttplib.cmake b/CMakeModules/Findhttplib.cmake index 861207eb5..861207eb5 100644 --- a/externals/find-modules/Findhttplib.cmake +++ b/CMakeModules/Findhttplib.cmake diff --git a/externals/find-modules/Findinih.cmake b/CMakeModules/Findinih.cmake index b8d38dcff..b8d38dcff 100644 --- a/externals/find-modules/Findinih.cmake +++ b/CMakeModules/Findinih.cmake diff --git a/externals/find-modules/Findlibusb.cmake b/CMakeModules/Findlibusb.cmake index 0eadce957..0eadce957 100644 --- a/externals/find-modules/Findlibusb.cmake +++ b/CMakeModules/Findlibusb.cmake diff --git a/externals/find-modules/Findlz4.cmake b/CMakeModules/Findlz4.cmake index 7a9a02d4e..7a9a02d4e 100644 --- a/externals/find-modules/Findlz4.cmake +++ b/CMakeModules/Findlz4.cmake diff --git a/externals/find-modules/Findzstd.cmake b/CMakeModules/Findzstd.cmake index ae3ea0865..ae3ea0865 100644 --- a/externals/find-modules/Findzstd.cmake +++ b/CMakeModules/Findzstd.cmake diff --git a/externals/cmake-modules/WindowsCopyFiles.cmake b/CMakeModules/WindowsCopyFiles.cmake index 08b598365..08b598365 100644 --- a/externals/cmake-modules/WindowsCopyFiles.cmake +++ b/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 |