diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdbe5d1bf2..5cb8e58efd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -458,15 +458,15 @@ if (YUZU_USE_CPM)
 
     # Opus
     AddJsonPackage(opus)
-    if (NOT TARGET Opus::opus)
-        add_library(Opus::opus ALIAS opus)
-    endif()
     if (Opus_ADDED)
         if (MSVC AND CXX_CLANG)
             target_compile_options(opus PRIVATE
                 -Wno-implicit-function-declaration
             )
         endif()
+        if (NOT TARGET Opus::opus)
+            add_library(Opus::opus ALIAS opus)
+        endif()
     endif()
 
     # VulkanUtilityHeaders - pulls in headers and utility libs
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 184b049d06..2f6350fc43 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -141,7 +141,7 @@ else()
         -Wno-missing-field-initializers
     )
 
-    if (CXX_CLANG OR CXX_ICC) # Clang or AppleClang
+    if (CXX_APPLE OR CXX_CLANG OR CXX_ICC) # Clang or AppleClang
         if (NOT MSVC)
             add_compile_options(
                 -Werror=shadow-uncaptured-local