Commit: 4fb67ae8094c62064b46f33a3ac04d34e9b81e93
Author: Ankit Meel
Date: Mon Oct 19 21:38:35 2020 +0530
Branches: master
https://developer.blender.org/rB4fb67ae8094c62064b46f33a3ac04d34e9b81e93
CMake/macOS: use system OpenAL for the time being.
Revert part of {rB83124856d05ee4da605ab247e6}
===================================================================
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 0413b89f6bd..4697e6bc766 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -53,6 +53,13 @@ find_package(ZLIB REQUIRED)
find_package(BZip2 REQUIRED)
list(APPEND ZLIB_LIBRARIES ${BZIP2_LIBRARIES})
+if(WITH_OPENAL)
+ find_package(OpenAL)
+ if(NOT OPENAL_FOUND)
+ set(WITH_OPENAL OFF)
+ endif()
+endif()
+
if(NOT DEFINED LIBDIR)
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin)
# Prefer lib directory paths
@@ -72,15 +79,6 @@ if(EXISTS ${LIBDIR})
without_system_libs_begin()
endif()
-if(WITH_OPENAL)
- # Hardcoding this is better than CMake searching in `~/Library/Frameworks`
- # or `/Library/Frameworks` or Xcode SDK's frameworks.
- set(OPENAL_INCLUDE_DIR "${LIBDIR}/openal/include/AL")
- set(OPENAL_LIBRARY)
- set(OPENAL_FOUND TRUE)
- print_found_status("OpenAL" "${OPENAL_INCLUDE_DIR}")
-endif()
-
if(WITH_ALEMBIC)
find_package(Alembic)
endif()
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
