[cmake] fixes for XCode when having languages other than C/C++

Signed-off-by: lizzie <lizzie@eden-emu.dev>

CMakeLists.txt

@@ -143,8 +143,8 @@ if (MSVC AND ARCHITECTURE_x86)
 endif()
 
 if (CXX_CLANG_CL)
+    # clang-cl prints literally 10000+ warnings without this
     add_compile_options(
-        # clang-cl prints literally 10000+ warnings without this
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-command-line-argument>
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unsafe-buffer-usage>
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-value>
@@ -153,13 +153,15 @@ if (CXX_CLANG_CL)
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-reserved-identifier>
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-deprecated-declarations>
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type-mismatch>
-        $<$<COMPILE_LANGUAGE:C,CXX>:/EHsc>)
+        $<$<COMPILE_LANGUAGE:C,CXX>:/EHsc>
+    )
 
     # REQUIRED CPU features IN Windows-amd64
     if (ARCHITECTURE_x86_64)
         add_compile_options(
             $<$<COMPILE_LANGUAGE:C,CXX>:-msse4.1>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-mcx16>)
+            $<$<COMPILE_LANGUAGE:C,CXX>:-mcx16>
+        )
     endif()
 endif()
 
@@ -395,13 +397,15 @@ if (Boost_ADDED)
     if (NOT MSVC OR CXX_CLANG)
         # boost sucks
         if (PLATFORM_SUN)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthreads")
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthreads")
+            add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-pthreads>)
         endif()
 
-        target_compile_options(boost_heap INTERFACE -Wno-shadow)
-        target_compile_options(boost_icl INTERFACE -Wno-shadow)
-        target_compile_options(boost_asio INTERFACE -Wno-conversion -Wno-implicit-fallthrough)
+        target_compile_options(boost_heap INTERFACE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-shadow>)
+        target_compile_options(boost_icl INTERFACE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-shadow>)
+        target_compile_options(boost_asio INTERFACE
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-fallthrough>
+        )
     endif()
 endif()
 
@@ -440,7 +444,7 @@ if (NOT YUZU_STATIC_ROOM)
     if (Opus_ADDED)
         if (MSVC AND CXX_CLANG)
             target_compile_options(opus PRIVATE
-                -Wno-implicit-function-declaration
+                $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-implicit-function-declaration>
             )
         endif()
     endif()

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

externals/libusb/CMakeLists.txt

@@ -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}")

src/CMakeLists.txt

@@ -118,47 +118,48 @@ if (MSVC AND NOT CXX_CLANG)
 else()
     if (NOT MSVC)
         add_compile_options(
-            -fwrapv
-            -fno-rtti # Disable RTTI
-            -pipe
+            $<$<COMPILE_LANGUAGE:C,CXX>:-fwrapv>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-pipe>
         )
+        # Disable RTTI (C++ only)
+        add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>)
     endif()
 
     add_compile_options(
-        -Werror=all
-        -Werror=extra
-        -Werror=missing-declarations
-        -Werror=shadow
-        -Werror=unused
-
-        -Wno-attributes
-        -Wno-invalid-offsetof
-        -Wno-unused-parameter
-        -Wno-missing-field-initializers
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=all>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=extra>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=missing-declarations>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=shadow>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=unused>
+
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-attributes>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-invalid-offsetof>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>
     )
 
     if (CXX_CLANG OR CXX_ICC OR CXX_APPLE) # Clang, AppleClang, or Intel C++
         if (NOT MSVC)
             add_compile_options(
-                -Werror=shadow-uncaptured-local
-                -Werror=implicit-fallthrough
-                -Werror=type-limits
+                $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=shadow-uncaptured-local>
+                $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=implicit-fallthrough>
+                $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=type-limits>
             )
         endif()
 
         add_compile_options(
-            -Wno-braced-scalar-init
-            -Wno-unused-private-field
-            -Wno-nullability-completeness
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-braced-scalar-init>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-private-field>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-nullability-completeness>
         )
     endif()
 
     if (ARCHITECTURE_x86_64)
-        add_compile_options("-mcx16")
+        add_compile_options(-mcx16)
     endif()
 
     if (APPLE AND CXX_CLANG)
-        add_compile_options("-stdlib=libc++")
+        add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-stdlib=libc++>)
     endif()
 
     # GCC bugs
@@ -166,9 +167,9 @@ else()
         # These diagnostics would be great if they worked, but are just completely broken
         # and produce bogus errors on external libraries like fmt.
         add_compile_options(
-            -Wno-array-bounds
-            -Wno-stringop-overread
-            -Wno-stringop-overflow
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-array-bounds>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-stringop-overread>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-stringop-overflow>
         )
     endif()
 

src/audio_core/CMakeLists.txt

@@ -222,9 +222,8 @@ if (MSVC)
     )
 else()
     target_compile_options(audio_core PRIVATE
-        -Werror=conversion
-
-        -Wno-sign-conversion
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion>
     )
 endif()
 

src/common/CMakeLists.txt

@@ -225,8 +225,10 @@ else()
 endif()
 
 if(CXX_CLANG)
-    target_compile_options(common PRIVATE -fsized-deallocation
-        -Werror=unreachable-code-aggressive)
+    target_compile_options(common PRIVATE
+        $<$<COMPILE_LANGUAGE:C,CXX>:-fsized-deallocation>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=unreachable-code-aggressive>
+    )
     target_compile_definitions(
         common
         PRIVATE

src/core/CMakeLists.txt

@@ -1195,13 +1195,14 @@ if (MSVC)
     )
 else()
     target_compile_options(core PRIVATE
-        -Werror=conversion
-        -Wno-sign-conversion
-        -Wno-cast-function-type
-        $<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>)
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type>
+        $<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>
+    )
     # pre-clang19 will spam with "OH DID YOU MEAN THIS?" otherwise...
     if (CXX_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19)
-        target_compile_options(core PRIVATE -Wno-cast-function-type-mismatch)
+        target_compile_options(core PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type-mismatch>)
     endif()
 endif()
 

src/dynarmic/src/dynarmic/CMakeLists.txt

@@ -68,6 +68,7 @@ add_library(dynarmic STATIC
     frontend/decoder/matcher.h
     frontend/imm.cpp
     frontend/imm.h
+    interface/halt_reason.h
     interface/exclusive_monitor.h
     interface/optimization_flags.h
     ir/acc_type.h

src/hid_core/CMakeLists.txt

@@ -148,11 +148,9 @@ if (MSVC)
     )
 else()
     target_compile_options(hid_core PRIVATE
-        -Werror=conversion
-
-        -Wno-sign-conversion
-        -Wno-cast-function-type
-
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type>
         $<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>
     )
 endif()

src/input_common/CMakeLists.txt

@@ -44,9 +44,7 @@ if (MSVC)
         /we4800 # Implicit conversion from 'type' to bool. Possible information loss
     )
 else()
-    target_compile_options(input_common PRIVATE
-        -Werror=conversion
-    )
+    target_compile_options(input_common PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>)
 endif()
 
 if (ANDROID)

src/shader_recompiler/CMakeLists.txt

@@ -253,8 +253,7 @@ if (MSVC)
     )
 else()
     target_compile_options(shader_recompiler PRIVATE
-        -Werror=conversion
-
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>
         # Bracket depth determines maximum size of a fold expression in Clang since 9c9974c3ccb6.
         # And this in turns limits the size of a std::array.
         $<$<CXX_COMPILER_ID:Clang>:-fbracket-depth=1024>

src/tests/CMakeLists.txt

@@ -32,8 +32,9 @@ add_test(NAME tests COMMAND tests)
 # needed for vma
 if (NOT MSVC)
     target_compile_options(tests PRIVATE
-        -Wno-conversion
-        -Wno-unused-variable
-        -Wno-unused-parameter
-        -Wno-missing-field-initializers)
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-variable>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>
+    )
 endif()

src/video_core/CMakeLists.txt

@@ -363,14 +363,15 @@ else()
     if (APPLE)
         # error: declaration shadows a typedef in 'interval_base_set<SubType, DomainT, Compare, Interval, Alloc>'
         # error: implicit conversion loses integer precision: 'int' to 'boost::icl::bound_type' (aka 'unsigned char')
-        target_compile_options(video_core PRIVATE -Wno-shadow -Wno-unused-local-typedef)
+        target_compile_options(video_core PRIVATE
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-shadow>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-local-typedef>
+        )
     else()
-        target_compile_options(video_core PRIVATE -Werror=conversion)
+        target_compile_options(video_core PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>)
     endif()
 
-    target_compile_options(video_core PRIVATE
-        -Wno-sign-conversion
-    )
+    target_compile_options(video_core PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion>)
 
     # xbyak
     set_source_files_properties(macro/macro_jit_x64.cpp PROPERTIES COMPILE_OPTIONS "-Wno-conversion;-Wno-shadow")

src/yuzu/CMakeLists.txt

@@ -443,10 +443,11 @@ endif()
 if (NOT MSVC AND (APPLE OR NOT YUZU_STATIC_BUILD))
     # needed for vma
     target_compile_options(yuzu PRIVATE
-        -Wno-conversion
-        -Wno-unused-variable
-        -Wno-unused-parameter
-        -Wno-missing-field-initializers)
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-variable>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>
+    )
 endif()
 
 # Remember that the linker is incredibly stupid.

src/yuzu/user_data_migration.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <QMainWindow>
-#include "../yuzu/migration_worker.h"
+#include "yuzu/migration_worker.h"
 
 // TODO(crueter): Quick implementation
 class UserDataMigrator {

src/yuzu_cmd/CMakeLists.txt

@@ -60,8 +60,9 @@ create_target_directory_groups(yuzu-cmd)
 # needed for vma
 if (NOT MSVC)
     target_compile_options(yuzu-cmd PRIVATE
-        -Wno-conversion
-        -Wno-unused-variable
-        -Wno-unused-parameter
-        -Wno-missing-field-initializers)
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-conversion>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-variable>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-missing-field-initializers>
+    )
 endif()