[Bf-blender-cvs] [8f2ebcf93f9] blender-v2.91-release: macOS: find Jack framework in system directories

[Ankit Meel]

Commit: 8f2ebcf93f98e1cb1c6fa51ba7e4ec6fd555e39c
Author: Ankit Meel
Date:   Wed Nov 4 01:48:33 2020 +0530
Branches: blender-v2.91-release
https://developer.blender.org/rB8f2ebcf93f98e1cb1c6fa51ba7e4ec6fd555e39c

macOS: find Jack framework in system directories

Until it is decided whether to ship JACK with pre-compiled libraries,
search for the same in system directories.

Ref T79261
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D9436

===================================================================

M	build_files/cmake/platform/platform_apple.cmake

===================================================================

diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index 962033c32bc..d529fbb9d92 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -60,6 +60,17 @@ if(WITH_OPENAL)
   endif()
 endif()
 
+if(WITH_JACK)
+  find_library(JACK_FRAMEWORK
+    NAMES jackmp
+  )
+  if(NOT JACK_FRAMEWORK)
+    set(WITH_JACK OFF)
+  else()
+    set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers)
+  endif()
+endif()
+
 if(NOT DEFINED LIBDIR)
   set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin)
   # Prefer lib directory paths
@@ -94,17 +105,6 @@ if(WITH_OPENSUBDIV)
   find_package(OpenSubdiv)
 endif()
 
-if(WITH_JACK)
-  find_library(JACK_FRAMEWORK
-    NAMES jackmp
-  )
-  if(NOT JACK_FRAMEWORK)
-    set(WITH_JACK OFF)
-  else()
-    set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers)
-  endif()
-endif()
-
 if(WITH_CODEC_SNDFILE)
   find_package(SndFile)
   find_library(_sndfile_FLAC_LIBRARY NAMES flac HINTS ${LIBDIR}/sndfile/lib)