diff options
| author | 2023-11-03 19:27:08 +0100 | |
|---|---|---|
| committer | 2023-11-30 16:54:00 +0100 | |
| commit | d2bb9e9729bbdeb396817c2335c4fafbf5ac94a2 (patch) | |
| tree | f09b1f3a4c07ffdd1ba36ad6993a3220c5fbdf0b /externals | |
| parent | Merge pull request #12229 from liamwhite/qcom-wtf (diff) | |
| download | yuzu-d2bb9e9729bbdeb396817c2335c4fafbf5ac94a2.tar.gz yuzu-d2bb9e9729bbdeb396817c2335c4fafbf5ac94a2.tar.xz yuzu-d2bb9e9729bbdeb396817c2335c4fafbf5ac94a2.zip | |
cmake: prefer system gamemode library
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | externals/gamemode/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | externals/gamemode/gamemode_client.h (renamed from externals/gamemode/include/gamemode_client.h) | 3 |
3 files changed, 4 insertions, 16 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 04007a538..407c5c640 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -193,8 +193,10 @@ if (ANDROID) | |||
| 193 | endif() | 193 | endif() |
| 194 | endif() | 194 | endif() |
| 195 | 195 | ||
| 196 | if (UNIX AND NOT APPLE) | 196 | if (UNIX AND NOT APPLE AND NOT TARGET gamemode::headers) |
| 197 | add_subdirectory(gamemode) | 197 | add_library(gamemode INTERFACE) |
| 198 | target_include_directories(gamemode INTERFACE gamemode) | ||
| 199 | add_library(gamemode::headers ALIAS gamemode) | ||
| 198 | endif() | 200 | endif() |
| 199 | 201 | ||
| 200 | # Breakpad | 202 | # Breakpad |
diff --git a/externals/gamemode/CMakeLists.txt b/externals/gamemode/CMakeLists.txt deleted file mode 100644 index 87095642e..000000000 --- a/externals/gamemode/CMakeLists.txt +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | # SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 4 | project(gamemode LANGUAGES CXX C) | ||
| 5 | |||
| 6 | add_library(gamemode include/gamemode_client.h) | ||
| 7 | |||
| 8 | target_link_libraries(gamemode PRIVATE common) | ||
| 9 | |||
| 10 | target_include_directories(gamemode PUBLIC include) | ||
| 11 | set_target_properties(gamemode PROPERTIES LINKER_LANGUAGE C) | ||
diff --git a/externals/gamemode/include/gamemode_client.h b/externals/gamemode/gamemode_client.h index 184812334..b9f64fe46 100644 --- a/externals/gamemode/include/gamemode_client.h +++ b/externals/gamemode/gamemode_client.h | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2017-2019 Feral Interactive | ||
| 2 | // SPDX-License-Identifier: BSD-3-Clause | ||
| 3 | |||
| 4 | /* | 1 | /* |
| 5 | 2 | ||
| 6 | Copyright (c) 2017-2019, Feral Interactive | 3 | Copyright (c) 2017-2019, Feral Interactive |