diff options
| author | Ankit Meel <ankitjmeel@gmail.com> | 2021-07-26 16:09:08 +0300 |
|---|---|---|
| committer | Ankit Meel <ankitjmeel@gmail.com> | 2021-07-26 16:09:08 +0300 |
| commit | a9121640be063b8c45a021782a1914a3060bf71e (patch) | |
| tree | 9bce120bf79623499764ce397026074742e9b205 | |
| parent | 14f94fd1ca592bb532bbbfa9d65056fba955db17 (diff) | |
macOS Cleanup: Remove old version specific code
Reviewed By: #platform_macos, brecht
Differential Revision: https://developer.blender.org/D12021
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 8 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 7 |
2 files changed, 3 insertions, 12 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 90188751fc0..70973eeda99 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -404,7 +404,7 @@ endif() # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags. if(WITH_OPENMP) - if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0") + if(CMAKE_C_COMPILER_ID MATCHES "Clang") # Use OpenMP from our precompiled libraries. message(STATUS "Using ${LIBDIR}/openmp for OpenMP") set(OPENMP_CUSTOM ON) @@ -480,10 +480,8 @@ else() set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic") endif() -if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5) - # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv - string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024") -endif() +# Clang has too low template depth of 128 for libmv. +string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024") # Avoid conflicts with Luxrender, and other plug-ins that may use the same # libraries as Blender with a different version or build options. diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index a4b32fac9fc..c3aeffe8fda 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1060,13 +1060,6 @@ elseif(APPLE) endif() endif() - if(WITH_LLVM AND NOT LLVM_STATIC) - install( - FILES ${LIBDIR}/llvm/lib/libLLVM-3.4.dylib - DESTINATION Blender.app/Contents/MacOS - ) - endif() - # python if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK) # Copy the python libs into the install directory |