From 367893bf50495e1629fd0572ada5c78f6f108e2a Mon Sep 17 00:00:00 2001
From: swang251-MB <wangsong.mus@gmail.com>
Date: Fri, 17 Sep 2021 21:52:08 -0400
Subject: [PATCH] [FindCoreAudio.cmake] Updated

---
 CMakeLists.txt            | 20 +++++++-------------
 cmake/FindCoreAudio.cmake | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 cmake/FindCoreAudio.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a6c058..151ac5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,20 +63,14 @@ if(REALTIME)
 			target_link_libraries(stk PUBLIC ${ALSA_LIBRARIES})
             target_compile_definitions(stk PUBLIC __LINUX_ALSA__)
         endif()
+    elseif(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
+        #==============    MAC OS    ================#
+        message("Machintosh!")
+        find_package(CoreAudio REQUIRED)
+        include_directories(${COREAUDIO_INCLUDE_DIRS})
+        target_compile_definitions(stk PUBLIC -D__MACOSX_CORE__)
+        target_link_libraries(stk PUBLIC COREAUDIO_LIBRARY COREAUDIO_FOUNDATION COREAUDIO_MIDI)
     endif()
-  elseif(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
-	#==============    MAC OS      ================#
-    message("MacOS!")
-	find_package(CoreAudio)
-	if(ENABLE_CORE)
-	  if(COREAUDIO_INCLUDE_DIRS)
-		include_directories(${COREAUDIO_INCLUDE_DIRS})
-	  else()
-		message(FATAL_ERROR "CoreAudio header files not found!")
-	  endif()
-      target_compile_definitions(stk PUBLIC -D__MACOSX_CORE__)
-	  target_link_libraries(stk PUBLIC COREAUDIO_LIBRARY COREAUDIO_FOUNDATION COREAUDIO_MIDI)
-	endif()
 
   # TODO: WINDOWS SUPPORT
   elseif(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
diff --git a/cmake/FindCoreAudio.cmake b/cmake/FindCoreAudio.cmake
new file mode 100644
index 0000000..c3e710e
--- /dev/null
+++ b/cmake/FindCoreAudio.cmake
@@ -0,0 +1,21 @@
+find_library(COREAUDIO_LIBRARY CoreAudio)
+find_library(COREAUDIO_FOUNDATION CoreFoundation)
+find_library(COREAUDIO_MIDI CoreMIDI)
+find_path(COREAUDIO_INCLUDE_DIRS CoreAudio/CoreAudio.h)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+    CoreAudio
+    DEFAULT_MSG 
+    COREAUDIO_LIBRARY
+    COREAUDIO_FOUNDATION
+    COREAUDIO_MIDI
+    COREAUDIO_INCLUDE_DIRS)
+
+mark_as_advanced(
+    COREAUDIO_LIBRARY
+    COREAUDIO_FOUNDATION
+    COREAUDIO_MIDI
+    COREAUDIO_INCLUDE_DIRS)
+
+