Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/macros.cmake2
-rw-r--r--build_files/cmake/platform/platform_apple.cmake12
2 files changed, 7 insertions, 7 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index e75505e9885..8498c68c21c 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1243,7 +1243,7 @@ macro(without_system_libs_begin)
set(CMAKE_IGNORE_PATH "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES};${CMAKE_SYSTEM_INCLUDE_PATH};${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES};${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}")
if(APPLE)
# Avoid searching for headers in frameworks (like Mono), and libraries in LIBDIR.
- set(CMAKE_FIND_FRAMEWORK LAST)
+ set(CMAKE_FIND_FRAMEWORK NEVER)
endif()
endmacro()
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index 36e6d71bfb2..0413b89f6bd 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -73,12 +73,12 @@ if(EXISTS ${LIBDIR})
endif()
if(WITH_OPENAL)
- find_package(OpenAL)
- if(OPENAL_FOUND)
- set(WITH_OPENAL ON)
- else()
- set(WITH_OPENAL OFF)
- endif()
+ # 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)