more misc cleanup

ares-emulator · Dec 3, 2024 · 8848534 · 8848534
1 parent d9a7dbd
commit 8848534
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 14 deletions.
diff --git a/cmake/finders/FindAO.cmake b/cmake/finders/FindAO.cmake
@@ -25,14 +25,6 @@ This will define the following variables:
 ``AO_LIBRARIES``
   Libraries needed to link to AO.
 
-Cache Variables
-^^^^^^^^^^^^^^^
-
-The following cache variables may also be set:
-.
-``GTK_LIBRARY``
-  The path to the SDL library.
-
 #]=======================================================================]
 
 include(FindPackageHandleStandardArgs)

diff --git a/cmake/finders/FindOSS.cmake b/cmake/finders/FindOSS.cmake
@@ -20,7 +20,7 @@ This will define the following variables:
   True if the system has OSS.
 ``OSS_VERSION``
   The version of OSS which was found.
-``GTK_INCLUDE_DIR``
+``OSS_INCLUDE_DIR``
   Include directories needed to use OSS.
 
 #]=======================================================================]

diff --git a/cmake/finders/FindPulseAudio.cmake b/cmake/finders/FindPulseAudio.cmake
@@ -1,3 +1,36 @@
+#[=======================================================================[.rst:
+FindPulseAudio
+-------
+
+Finds the Pulse Audio library.
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+This module provides the following imported targets, if found:
+
+``PulseAudio::PulseAudio``
+``PulseAudio::PulseAudioSimple``
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This will define the following variables:
+
+``PulseAudio_FOUND``
+  True if the system has PulseAudio.
+``PulseAudio_VERSION``
+  The version of PulseAudio which was found.
+``PulseAudio_INCLUDE_DIR``
+  Include directories needed to use PulseAudio.
+``PulseAudio_LIBRARY``
+  The location of the PulseAudio library.
+``PulseAudioSimple_LIBRARY``
+  The location of the simple version of the PulseAudio library.
+  
+
+#]=======================================================================]
+
 include(FindPackageHandleStandardArgs)
 
 find_package(PkgConfig QUIET)

diff --git a/cmake/macos/xcode.cmake b/cmake/macos/xcode.cmake
@@ -79,15 +79,14 @@ set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT[variant=MinSizeRel] dwarf-wit
 # Strip unused code
 set(CMAKE_XCODE_ATTRIBUTE_DEAD_CODE_STRIPPING YES)
 
-# Build active architecture only when in Debug configuration
-set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH[variant=Debug] YES)
-
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
+
 # Enable weak references in manual retain release
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_WEAK YES)
 
 # Disable automatic linking of imported modules in ObjC
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_MODULES_AUTOLINK NO)
+
 # Enable strict msg_send rules for ObjC
 set(CMAKE_XCODE_ATTRIBUTE_ENABLE_STRICT_OBJC_MSGSEND YES)
 

diff --git a/cmake/windows/compilerconfig.cmake b/cmake/windows/compilerconfig.cmake
@@ -29,11 +29,9 @@ if(ENABLE_CCACHE AND CCACHE_PROGRAM)
 endif()
 
 if(CMAKE_GENERATOR_PLATFORM)
-  message(AUTHOR_WARNING "cmake generator platform is set to ${CMAKE_GENERATOR_PLATFORM}")
   set(arch ${CMAKE_GENERATOR_PLATFORM})
   set(platform windows-${arch})
 else()
-  message(AUTHOR_WARNING "cmake system processor is set to ${CMAKE_SYSTEM_PROCESSOR}")
   if(CMAKE_SYSTEM_PROCESSOR STREQUAL ARM64)
     set(arch arm64)
     set(platform windows-${arch})