[Bf-blender-cvs] [c735aca42e9] master: CMake/macOS/OpenMP: allow use of LLVM-Clang with OpenMP.

Ankit Meel noreply at git.blender.org
Sat Oct 10 13:00:32 CEST 2020


Commit: c735aca42e9f5961fec7e5d5fc196b5bd6b85f56
Author: Ankit Meel
Date:   Sat Oct 10 16:28:11 2020 +0530
Branches: master
https://developer.blender.org/rBc735aca42e9f5961fec7e5d5fc196b5bd6b85f56

CMake/macOS/OpenMP: allow use of LLVM-Clang with OpenMP.

The "Apple" part is guaranteed by the platform file.
"Clang" is enough to differentiate it from other compilers.

Came across this due to the custom built LLVM toolchain I'm using.

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

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 f1cbef47a1d..1eaef149f30 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -365,7 +365,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 "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
+  if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
     # Use OpenMP from our precompiled libraries.
     message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
     set(OPENMP_CUSTOM ON)



More information about the Bf-blender-cvs mailing list