diff options
| author | Ankit Meel <ankitjmeel@gmail.com> | 2020-11-03 23:28:10 +0300 |
|---|---|---|
| committer | Ankit Meel <ankitjmeel@gmail.com> | 2020-11-03 23:28:10 +0300 |
| commit | f109b63431a35cb01f053f04d0e793a25d6a5bf9 (patch) | |
| tree | 188b16fb4328fc907e7b3e73b64f85c29ef2e166 /build_files | |
| parent | fe7093fae466b95e54f15d358107c38b825a4f83 (diff) | |
| parent | 8f2ebcf93f98e1cb1c6fa51ba7e4ec6fd555e39c (diff) | |
Merge branch 'blender-v2.91-release' into master
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index e20be34df3f..084426b8572 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) |