[Bf-blender-cvs] [841460afceb] blender-v3.4-release: Build: add back WITH_JACK option on macOS, but disabled by default

Brecht Van Lommel noreply at git.blender.org
Wed Nov 16 18:09:08 CET 2022


Commit: 841460afcebd489b82caafd4b44b21cbbfd028db
Author: Brecht Van Lommel
Date:   Mon Nov 14 19:14:49 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB841460afcebd489b82caafd4b44b21cbbfd028db

Build: add back WITH_JACK option on macOS, but disabled by default

Jack has not been installed on the buildbot builders for a long time and so
should not be enabled by default to pass strict build options added in D16104.

However for those doing custom builds the option should remain available.

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f6217d4ce8..068276da155 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -345,8 +345,12 @@ if(APPLE)
 else()
   set(WITH_COREAUDIO OFF)
 endif()
-if(UNIX AND NOT APPLE)
-  option(WITH_JACK          "Enable JACK Support (http://www.jackaudio.org)" ON)
+if(NOT WIN32)
+  if(APPLE)
+    option(WITH_JACK          "Enable JACK Support (http://www.jackaudio.org)" OFF)
+  else()
+    option(WITH_JACK          "Enable JACK Support (http://www.jackaudio.org)" ON)
+  endif()
   option(WITH_JACK_DYNLOAD  "Enable runtime dynamic JACK libraries loading" OFF)
 else()
   set(WITH_JACK OFF)



More information about the Bf-blender-cvs mailing list