diff options
| author | lizzie <lizzie@eden-emu.dev> | 2026-03-26 04:46:43 +0100 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-03-26 04:46:43 +0100 |
| commit | 9cb700165634a271437abed723a53888eeb6be9c (patch) | |
| tree | b398a3765217901c0969147b69fa36d462a9aaff /externals | |
| parent | f0d77e86e34cde3813f7b1dbfc4d1a9e8940b21b (diff) | |
[cmake] fixes for XCode when having languages other than C/C++ (#3772)
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3772
Reviewed-by: crueter <crueter@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | externals/libusb/CMakeLists.txt | 4 |
2 files changed, 12 insertions, 11 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 7b4c481ba5..1ab537f44d 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -109,16 +109,15 @@ if(ENABLE_CUBEB) if (cubeb_ADDED) if (NOT MSVC) if (TARGET speex) - target_compile_options(speex PRIVATE -Wno-sign-compare) + target_compile_options(speex PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-compare>) endif() - set_target_properties(cubeb PROPERTIES COMPILE_OPTIONS "") target_compile_options(cubeb INTERFACE - -Wno-implicit-const-int-float-conversion - -Wno-shadow - -Wno-missing-declarations - -Wno-return-type - -Wno-uninitialized + $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-const-int-float-conversion> + $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-shadow> + $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-declarations> + $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-return-type> + $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-uninitialized> ) else() target_compile_options(cubeb PRIVATE @@ -184,7 +183,9 @@ if (YUZU_USE_BUNDLED_SIRIT) else() AddJsonPackage(sirit) if(MSVC AND CXX_CLANG) - target_compile_options(siritobj PRIVATE -Wno-error=unused-command-line-argument) + target_compile_options(siritobj PRIVATE + $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-error=unused-command-line-argument> + ) endif() endif() @@ -220,7 +221,7 @@ AddJsonPackage(vulkan-memory-allocator) if (VulkanMemoryAllocator_ADDED) if (CXX_CLANG) target_compile_options(VulkanMemoryAllocator INTERFACE - -Wno-unused-variable + $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-variable> ) elseif(MSVC) target_compile_options(VulkanMemoryAllocator INTERFACE diff --git a/externals/libusb/CMakeLists.txt b/externals/libusb/CMakeLists.txt index 7eae81d3b6..47b54f43cc 100644 --- a/externals/libusb/CMakeLists.txt +++ b/externals/libusb/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later # SPDX-FileCopyrightText: 2020 yuzu Emulator Project @@ -232,7 +232,7 @@ else() # MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") ) find_package(Threads REQUIRED) if(THREADS_HAVE_PTHREAD_ARG) - target_compile_options(usb PUBLIC "-pthread") + target_compile_options(usb PUBLIC $<$<COMPILE_LANGUAGE:C,CXX>:-pthread>) endif() if(CMAKE_THREAD_LIBS_INIT) target_link_libraries(usb PRIVATE "${CMAKE_THREAD_LIBS_INIT}") |