[Bf-blender-cvs] [ebe23196929] master: Build: disable JACK option in macOS releases

[Brecht Van Lommel]

Commit: ebe231969294924ff057f5d999d05986f9c97352
Author: Brecht Van Lommel
Date:   Fri Sep 30 18:50:03 2022 +0200
Branches: master
https://developer.blender.org/rBebe231969294924ff057f5d999d05986f9c97352

Build: disable JACK option in macOS releases

It has not actually been enabled there for a long time in official releases,
so this just fixes the warning. Making it work again would be good, but for
now JACK is only supported on Linux.

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

M	CMakeLists.txt
M	build_files/cmake/config/blender_full.cmake
M	build_files/cmake/config/blender_release.cmake

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3ea162d040..e922a3b059a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,11 +336,9 @@ if(APPLE)
 else()
   set(WITH_COREAUDIO OFF)
 endif()
-if(NOT WIN32)
+if(UNIX AND NOT APPLE)
   option(WITH_JACK          "Enable JACK Support (http://www.jackaudio.org)" ON)
-  if(UNIX AND NOT APPLE)
-    option(WITH_JACK_DYNLOAD  "Enable runtime dynamic JACK libraries loading" OFF)
-  endif()
+  option(WITH_JACK_DYNLOAD  "Enable runtime dynamic JACK libraries loading" OFF)
 else()
   set(WITH_JACK OFF)
 endif()
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index 958eb17522b..95304bd64c7 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -66,13 +66,11 @@ set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
 if(APPLE)
   set(WITH_COREAUDIO           ON  CACHE BOOL "" FORCE)
 endif()
-if(NOT WIN32)
-  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
-endif()
 if(WIN32)
   set(WITH_WASAPI              ON  CACHE BOOL "" FORCE)
 endif()
 if(UNIX AND NOT APPLE)
+  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
   set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
   set(WITH_GHOST_XDND          ON  CACHE BOOL "" FORCE)
   set(WITH_PULSEAUDIO          ON  CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index d5f5230862b..74bbcb223c3 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -67,13 +67,11 @@ if(APPLE)
   set(WITH_COREAUDIO           ON  CACHE BOOL "" FORCE)
   set(WITH_CYCLES_DEVICE_METAL ON  CACHE BOOL "" FORCE)
 endif()
-if(NOT WIN32)
-  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
-endif()
 if(WIN32)
   set(WITH_WASAPI               ON  CACHE BOOL "" FORCE)
 endif()
 if(UNIX AND NOT APPLE)
+  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
   set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
   set(WITH_GHOST_XDND          ON  CACHE BOOL "" FORCE)
   set(WITH_PULSEAUDIO          ON  CACHE BOOL "" FORCE)