diff options
| author | 2020-10-20 22:15:59 -0400 | |
|---|---|---|
| committer | 2020-10-20 22:16:03 -0400 | |
| commit | e408bd3b7ce0f584475da88a770319bccca780b4 (patch) | |
| tree | 2d74f06d232f51c0255d3a440b4b12ff3e0a71db | |
| parent | Merge pull request #4814 from yuzu-emu/revert-4796-clang (diff) | |
| download | yuzu-e408bd3b7ce0f584475da88a770319bccca780b4.tar.gz yuzu-e408bd3b7ce0f584475da88a770319bccca780b4.tar.xz yuzu-e408bd3b7ce0f584475da88a770319bccca780b4.zip | |
core: Fix clang build pt.2
Resolves the clang build issue in a more unintrusive way.
| -rw-r--r-- | src/audio_core/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt index 54940a034..68c67507b 100644 --- a/src/audio_core/CMakeLists.txt +++ b/src/audio_core/CMakeLists.txt | |||
| @@ -51,9 +51,12 @@ if (NOT MSVC) | |||
| 51 | -Werror=implicit-fallthrough | 51 | -Werror=implicit-fallthrough |
| 52 | -Werror=reorder | 52 | -Werror=reorder |
| 53 | -Werror=sign-compare | 53 | -Werror=sign-compare |
| 54 | -Werror=unused-but-set-parameter | ||
| 55 | -Werror=unused-but-set-variable | ||
| 56 | -Werror=unused-variable | 54 | -Werror=unused-variable |
| 55 | |||
| 56 | $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-parameter> | ||
| 57 | $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-variable> | ||
| 58 | |||
| 59 | -Wno-sign-conversion | ||
| 57 | ) | 60 | ) |
| 58 | endif() | 61 | endif() |
| 59 | 62 | ||
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index b6dc25f6b..db1c9fdef 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -630,9 +630,12 @@ else() | |||
| 630 | -Werror=implicit-fallthrough | 630 | -Werror=implicit-fallthrough |
| 631 | -Werror=reorder | 631 | -Werror=reorder |
| 632 | -Werror=sign-compare | 632 | -Werror=sign-compare |
| 633 | -Werror=unused-but-set-parameter | ||
| 634 | -Werror=unused-but-set-variable | ||
| 635 | -Werror=unused-variable | 633 | -Werror=unused-variable |
| 634 | |||
| 635 | $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-parameter> | ||
| 636 | $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-variable> | ||
| 637 | |||
| 638 | -Wno-sign-conversion | ||
| 636 | ) | 639 | ) |
| 637 | endif() | 640 | endif() |
| 638 | 641 | ||