diff options
| author | 2022-12-31 14:23:38 +0100 | |
|---|---|---|
| committer | 2023-01-02 18:22:07 +0100 | |
| commit | eceee8c3d930563e26841d556f9acb965eab67c8 (patch) | |
| tree | c17a3f5362f35d7ffbcc46c881f1b656e71db81b /src | |
| parent | Merge pull request #9541 from abouvier/cmake-option (diff) | |
| download | yuzu-eceee8c3d930563e26841d556f9acb965eab67c8.tar.gz yuzu-eceee8c3d930563e26841d556f9acb965eab67c8.tar.xz yuzu-eceee8c3d930563e26841d556f9acb965eab67c8.zip | |
cmake: move find-modules to root cmake dir
Diffstat (limited to 'src')
| -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 |
3 files changed, 0 insertions, 5 deletions
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 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2017 Citra Emulator Project | 1 | # SPDX-FileCopyrightText: 2017 Citra Emulator Project |
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | 2 | # SPDX-License-Identifier: GPL-2.0-or-later |
| 3 | 3 | ||
| 4 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) | ||
| 5 | |||
| 6 | add_executable(yuzu-room | 4 | add_executable(yuzu-room |
| 7 | precompiled_headers.h | 5 | precompiled_headers.h |
| 8 | yuzu_room.cpp | 6 | 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) | |||
| 5 | set(CMAKE_AUTORCC ON) | 5 | set(CMAKE_AUTORCC ON) |
| 6 | set(CMAKE_AUTOUIC ON) | 6 | set(CMAKE_AUTOUIC ON) |
| 7 | set(CMAKE_INCLUDE_CURRENT_DIR ON) | 7 | set(CMAKE_INCLUDE_CURRENT_DIR ON) |
| 8 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) | ||
| 9 | 8 | ||
| 10 | # Set the RPATH for Qt Libraries | 9 | # Set the RPATH for Qt Libraries |
| 11 | # This must be done before the `yuzu` target is created | 10 | # 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 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2018 yuzu Emulator Project | 1 | # SPDX-FileCopyrightText: 2018 yuzu Emulator Project |
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | 2 | # SPDX-License-Identifier: GPL-2.0-or-later |
| 3 | 3 | ||
| 4 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) | ||
| 5 | |||
| 6 | # Credits to Samantas5855 and others for this function. | 4 | # Credits to Samantas5855 and others for this function. |
| 7 | function(create_resource file output filename) | 5 | function(create_resource file output filename) |
| 8 | # Read hex data from file | 6 | # Read hex data from file |